diff --git a/alsa-tools.spec b/alsa-tools.spec index 64bd8f5..039482b 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.25 -Release: 3%{?dist} +Release: 4%{?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 @@ -41,9 +41,9 @@ Source4: echomixer.png Source5: 90-alsa-tools-firmware.rules # Resized version of public domain clipart found here: # http://www.openclipart.org/detail/17428 -Source6: hwmixvolume.png -Source7: hwmixvolume.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source6: hwmixvolume.png +Source7: hwmixvolume.desktop + BuildRequires: alsa-lib-devel >= 1.0.24 %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel @@ -52,7 +52,7 @@ BuildRequires: fltk-devel Buildrequires: desktop-file-utils Requires: xorg-x11-fonts-misc # Needed for hwmixvolume -Requires: python-alsa +Requires: python-alsa %endif %description @@ -163,11 +163,8 @@ done 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 +mkdir -p ${RPM_BUILD_ROOT}/lib/udev/rules.d +install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d %if 0%{!?_without_tools:1} %files @@ -221,7 +218,7 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %doc %{_docdir}/%{name}-%{version}/mixartloader %doc %{_docdir}/%{name}-%{version}/usx2yloader %doc %{_docdir}/%{name}-%{version}/vxloader -%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules +/lib/udev/rules.d/*.rules /lib/udev/tascam_fpga /lib/udev/tascam_fw %{_bindir}/hdsploader @@ -231,6 +228,10 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d %endif %changelog +* Wed Aug 29 2012 Tim Jackson - 1.0.25-4 +- Move udev rules to /lib/udev/rules.d (rhbz #748206) +- remove %%BuildRoot and %%clean sections; no longer required + * Wed Jul 18 2012 Fedora Release Engineering - 1.0.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild