Merge branch 'frawhide' into owen/alsa-ucm-cros-overhaul

Signed-off-by: Owen-sz <owen@fyralabs.com>

anda/misc/alsa-ucm-cros/alsa-ucm-cros.spec

@@ -1,30 +1,44 @@
-%define debug_package %nil
+%define version_alsa_lib  1.2.15.3
+%define version_alsa_ucm  1.2.15.3
+%define version_tree_ucm  0.8
 
-Name:			alsa-ucm-cros
-Version:		0.8
-Release:		2%?dist
-Summary:		ALSA Use Case Manager configuration
-License:		BSD-3-Clause
-URL:			https://github.com/WeirdTreeThing/alsa-ucm-conf-cros/tree/standalone
-Source0:		https://github.com/WeirdTreeThing/alsa-ucm-conf-cros/archive/refs/tags/%version.tar.gz
-BuildArch:		noarch
+Name:       alsa-ucm-cros
+Summary:    ALSA Use Case Manager configuration for ChromeOS devices
+Version:    %{version_alsa_ucm}
+Release:    1%?dist
+Epoch:      1
+License:    BSD-3-Clause
+URL:        https://github.com/WeirdTreeThing/alsa-ucm-conf-cros
+Source0:    https://github.com/WeirdTreeThing/alsa-ucm-conf-cros/archive/refs/tags/%{version_tree_ucm}.tar.gz
+Source1:    ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2
+BuildArch:  noarch
+Packager:   Owen Zimmerman <owen@fyralabs.com>
+
+Requires:   alsa-lib >= %{version_alsa_lib}
+Conflicts:  alsa-ucm
 
 %description
-%summary for chromebooks.
+%summary.
 
 %prep
-%autosetup -n alsa-ucm-conf-cros-%version
+%autosetup -n alsa-ucm-conf-cros-%{version_tree_ucm}
 
 %build
 
 %install
-mkdir -p %buildroot%_datadir/alsa
-cp -r ucm2 %buildroot%_datadir/alsa/
+mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
+mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
+
+# Unpack UCMs
+tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/ucm" "*/ucm2"
+cp -r ucm2/ %{buildroot}/%{_datadir}/alsa/
 
 %files
-%doc README.md
 %license LICENSE
-%_datadir/alsa/ucm2/
+%doc README.md
+%{_datadir}/alsa/ucm
+%{_datadir}/alsa/ucm2
 
 %changelog
-%autochangelog
+* Tue Jan 27 2026 Owen Zimmerman <owen@fyralabs.com>
+- Initial commit

anda/misc/alsa-ucm-cros/anda.hcl

@@ -1,6 +1,10 @@
 project pkg {
-  arches = ["x86_64"]
+    arches = ["x86_64"]
   rpm {
-	spec = "alsa-ucm-cros.spec"
+	  spec = "alsa-ucm-cros.spec"
+  }
+  labels {
+    updbranch = 1
+    subrepo = "extras"
   }
 }

anda/misc/alsa-ucm-cros/update.rhai

@@ -1 +1,6 @@
-rpm.version(gh("WeirdTreeThing/alsa-ucm-conf-cros"));
+let v = bump::bodhi("alsa-lib", bump::as_bodhi_ver(labels.branch));
+rpm.global("version_alsa_ucm", v)
+if rpm.changed() {
+    rpm.global("version_alsa_lib", v)
+    rpm.global("version_tree_ucm", gh("WeirdTreeThing/alsa-ucm-conf-cros"));
+}