From d7e12d1017e2046d07b103d1c31cbccb23415313 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <jkysela@redhat.com>
Date: Wed, 18 Dec 2024 14:51:06 +0100
Subject: [PATCH] Move remaining files to /usr tree

Resolves: RHEL-70757

Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
---
 90-alsa-tools-firmware.rules | 13 ++++++-------
 alsa-tools.spec              | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/90-alsa-tools-firmware.rules b/90-alsa-tools-firmware.rules
index 790cddf..d19bcba 100644
--- a/90-alsa-tools-firmware.rules
+++ b/90-alsa-tools-firmware.rules
@@ -1,12 +1,11 @@
 # TASCAM US-428 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8000", RUN+="/lib/udev/tascam_fw"
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8001", RUN+="/lib/udev/tascam_fpga"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8000", RUN+="/usr/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8001", RUN+="/usr/lib/udev/tascam_fpga"
 
 # TASCAM US-224 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8004", RUN+="/lib/udev/tascam_fw"
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8005", RUN+="/lib/udev/tascam_fpga"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8004", RUN+="/usr/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8005", RUN+="/usr/lib/udev/tascam_fpga"
 
 # TASCAM US-122 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8006", RUN+="/lib/udev/tascam_fw"
-SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8007", RUN+="/lib/udev/tascam_fpga"
-
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8006", RUN+="/usr/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8007", RUN+="/usr/lib/udev/tascam_fpga"
diff --git a/alsa-tools.spec b/alsa-tools.spec
index d1a8811..bda04a0 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -25,7 +25,7 @@
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
 Version:        1.2.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 # Checked at least one source file from all the sub-projects contained in
 # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15
@@ -110,7 +110,7 @@ for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
 do
   case $i in
     usx2yloader)
-      (cd $i ; %make_install hotplugdir=/lib/udev) || exit 1
+      (cd $i ; %make_install hotplugdir=/usr/lib/udev) || exit 1
       ;;
     *)
       (cd $i ; %make_install) || exit 1
@@ -140,9 +140,9 @@ do
 done
 
 # convert hotplug stuff to udev
-rm -f %{buildroot}/lib/udev/tascam_fw.usermap
-mkdir -p %{buildroot}/lib/udev/rules.d
-install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d
+rm -f %{buildroot}/usr/lib/udev/tascam_fw.usermap
+mkdir -p %{buildroot}/usr/lib/udev/rules.d
+install -m 644 %{SOURCE1} %{buildroot}/usr/lib/udev/rules.d
 
 %if 0%{!?_without_tools:1}
 %files
@@ -191,9 +191,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d
 %doc %{_pkgdocdir}/mixartloader
 %doc %{_pkgdocdir}/usx2yloader
 %doc %{_pkgdocdir}/vxloader
-/lib/udev/rules.d/*.rules
-/lib/udev/tascam_fpga
-/lib/udev/tascam_fw
+/usr/lib/udev/rules.d/*.rules
+/usr/lib/udev/tascam_fpga
+/usr/lib/udev/tascam_fw
 %{_bindir}/hdsploader
 %{_bindir}/mixartloader
 %{_bindir}/usx2yloader
@@ -201,6 +201,9 @@ install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d
 %endif
 
 %changelog
+* Wed Dec 18 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.11-5
+- Move remaining files to /usr tree
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.2.11-4
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018