diff --git a/90-alsa-tools-firmware.rules b/90-alsa-tools-firmware.rules new file mode 100644 index 0000000..69b0e72 --- /dev/null +++ b/90-alsa-tools-firmware.rules @@ -0,0 +1,12 @@ +# TASCAM US-428 usb sound card. +BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8000", RUN+="/lib/udev/tascam_fw" +BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8001", RUN+="/lib/udev/tascam_fpga" + +# TASCAM US-224 usb sound card. +BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8004", RUN+="/lib/udev/tascam_fw" +BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8005", RUN+="/lib/udev/tascam_fpga" + +# TASCAM US-122 usb sound card. +BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8006", RUN+="/lib/udev/tascam_fw" +BUS=="usb", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8007", RUN+="/lib/udev/tascam_fpga" + diff --git a/alsa-tools.spec b/alsa-tools.spec index 9c3090f..4a8b2cb 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.17 -Release: 1%{?dist} +Release: 2%{?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 @@ -38,6 +38,7 @@ Source1: envy24control.desktop Source2: envy24control.png Source3: echomixer.desktop Source4: echomixer.png +Source5: 90-alsa-tools-firmware.rules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} @@ -68,7 +69,9 @@ certain sound cards. %package firmware Summary: ALSA tools for uploading firmware to some soundcards Group: Applications/System -Requires: udev alsa-firmware +Requires: udev +Requires: alsa-firmware +Requires: fxload %description firmware @@ -101,7 +104,7 @@ done mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/{pixmaps,applications} for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} -do +do case $i in echomixer) (cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 @@ -120,7 +123,7 @@ do ;; *) (cd $i ; %makeinstall) || exit 1 esac - if [[ -s "${i}"/README ]] + if [[ -s "${i}"/README ]] then if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]] then @@ -128,14 +131,14 @@ do fi cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" fi - if [[ -s "${i}"/COPYING ]] + if [[ -s "${i}"/COPYING ]] then if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]] then mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" fi cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" - fi + fi if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then desktop-file-install --vendor fedora \ --add-category "X-Fedora" \ @@ -145,6 +148,13 @@ do fi done +# convert hotplug stuff to udev +rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb/tascam_fw.usermap +mkdir -p ${RPM_BUILD_ROOT}/lib/udev +mv ${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb/* ${RPM_BUILD_ROOT}/lib/udev +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d +install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -195,9 +205,9 @@ done %doc %{_docdir}/%{name}-%{version}/mixartloader %doc %{_docdir}/%{name}-%{version}/usx2yloader %doc %{_docdir}/%{name}-%{version}/vxloader -%{_sysconfdir}/hotplug/usb/tascam_fpga -%{_sysconfdir}/hotplug/usb/tascam_fw -%attr(0644,root,root) %{_sysconfdir}/hotplug/usb/tascam_fw.usermap +%{_sysconfdir}/udev/rules.d/*.rules +/lib/udev/tascam_fpga +/lib/udev/tascam_fw %{_bindir}/hdsploader %{_bindir}/mixartloader %{_bindir}/usx2yloader @@ -205,6 +215,9 @@ done %endif %changelog +* Fri Dec 5 2008 Jon McCann - 1.0.17-2 +- Convert hotplug stuff to udev + * Thu Jul 17 2008 Tim Jackson - 1.0.17-1 - Update to version 1.0.17