X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=alsa-tools.spec;h=9b55dcba8213963591fc5d72e9614c5770c9273f;hb=68eafbdb097604ea61f0dfab044e69c0d79170e6;hp=55583bc1052a5098e43c72e94bf95dd317261e40;hpb=2dce50a795e5fbb27b8dbeddaeb5938deec71ad1;p=packages%2Falsa-tools.git

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 55583bc..9b55dcb 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -1,18 +1,22 @@
+#
 # TODO: make description true (i.e. separate GUIs)
 # echomixer,envy24control,rmedigicontrol use GTK+ 2
 # hdspconf,hdspmixer use FLTK
 # qlo10k1 uses Qt 3
-# 
+#
+# Conditional build:
+%bcond_with	hotplug		# build with hotplug support for Tascam USB devices
+#
 Summary:	Advanced Linux Sound Architecture (ALSA) - tools
 Summary(pl.UTF-8):	Advanced Linux Sound Architecture (ALSA) - narzędzia
 Name:		alsa-tools
-Version:	1.0.16
+Version:	1.0.24.1
 Release:	1
 License:	GPL v2+
 Group:		Applications/Sound
 Source0:	ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2
-# Source0-md5:	10ddbcdb4ecf3459d8e64b3e89fdb514
-Patch0:		%{name}-asneeded.patch
+# Source0-md5:	08fe93a12006093e590d7ecc02b119dd
+Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-sh.patch
 Patch2:		%{name}-csp.patch
 URL:		http://www.alsa-project.org/
@@ -47,7 +51,8 @@ Pakiet zawiera działające z linii poleceń narzędzia dla projektu ALSA
 Summary:	Hotplug support for Tascam USB devices
 Summary(pl.UTF-8):	Wsparcie hotpluga do urządzeń USB Tascam
 Group:		Applications/Sound
-Requires:	udev-core
+Requires:	%{name} = %{version}-%{release}
+Requires:	hotplug
 
 %description tascam
 Hotplug support for Tascam USB devices, firmware loader.
@@ -110,7 +115,7 @@ for dir in %{progs}; do
 	[ -f README ] && cp -f README "README.$(basename $dir)"
 	[ -f NEWS ] && cp -f NEWS "NEWS.$(basename $dir)"
 	[ -f TODO ] && cp -f TODO "TODO.$(basename $dir)"
-	[ -f ltmain.sh ] && %{__libtoolize}
+	%{__libtoolize}
 	%{__aclocal}
 	%{__autoconf}
 	grep -q AC_CONFIG_HEADER configure.* && %{__autoheader}
@@ -127,6 +132,7 @@ sed -i 's:include:include/qt:g' acinclude.m4
 cp -f README README.qlo10k1
 cp -f NEWS NEWS.qlo10k1
 cp -f TODO TODO.qlo10k1
+%{__libtoolize}
 %{__aclocal} -I ../ld10k1
 %{__autoconf}
 %{__autoheader}
@@ -155,6 +161,10 @@ done
 
 install $odir/as10k1/examples/*.emu10k1 $RPM_BUILD_ROOT%{_datadir}/ld10k1/effects
 
+%if %{without hotplug}
+rm -r $RPM_BUILD_ROOT%{_sysconfdir}/hotplug
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -163,12 +173,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc */README.* */*/README.* */NEWS.*
-# alsamixer/TODO.* 
+%doc */README.* */*/README.* */NEWS.* */TODO.*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %{_datadir}/ld10k1
-%{_mandir}/man?/*
+%{_mandir}/man1/*.1*
 %{_desktopdir}/hdspconf.desktop
 %{_desktopdir}/hdspmixer.desktop
 %{_pixmapsdir}/hdspconf.png
@@ -176,11 +185,13 @@ rm -rf $RPM_BUILD_ROOT
 # for sbiload
 %{_datadir}/sounds/opl3
 
+%if %{with hotplug}
 %files tascam
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sysconfdir}/hotplug/usb/tascam_fpga
 %attr(755,root,root) %{_sysconfdir}/hotplug/usb/tascam_fw
 %{_sysconfdir}/hotplug/usb/tascam_fw.usermap
+%endif
 
 %files -n liblo10k1
 %defattr(644,root,root,755)