rpms/alsa-tools/F-7 alsa-tools.spec,1.13,1.14 sources,1.8,1.9
Tim Jackson (timj)
fedora-extras-commits at redhat.com
Thu Nov 15 17:00:09 UTC 2007
Author: timj
Update of /cvs/extras/rpms/alsa-tools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20976
Modified Files:
alsa-tools.spec sources
Log Message:
Update License tag to GPLv2+
Don't build -firmware subpackage again; licensing problems with alsa-firmware are delaying and there is a circular dep
Remove bogus "echomixer" from -firmware subpackage
Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/F-7/alsa-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- alsa-tools.spec 9 Dec 2006 10:01:32 -0000 1.13
+++ alsa-tools.spec 15 Nov 2007 16:59:37 -0000 1.14
@@ -1,6 +1,9 @@
-%{?!_without_tools: %define builddirstools as10k1 envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
-%{?_without_tools: %{!?_with_firmware: %define _with_firmware 1}}
-%{?_with_firmware: %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
+# Disable firmware build for now; the alsa-firmware package is not built
+# for Fedora yet (bug #217259)
+%define _without_firmware 1
+
+%{?!_without_tools: %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
+%{?!_without_firmware: %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
# The source tarball has been pruned to remove the "ac3dec" directory, due
# to legal concerns that the contents might be subject to patent claims
@@ -11,12 +14,22 @@
Summary: Specialist tools for ALSA
Name: alsa-tools
-Version: 1.0.12
-Release: 4%{?dist}
-License: GPL
+Version: 1.0.14
+Release: 3%{?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
+License: GPLv2+
Group: Applications/Multimedia
URL: http://www.alsa-project.org/
Source0: %{name}-%{version}-pruned.tar.bz2
+
+# The icons below were created by Tim Jackson from screenshots of the
+# apps in question. They suck, a lot. Better alternatives welcome!
+Source1: envy24control.desktop
+Source2: envy24control.png
+Source3: echomixer.desktop
+Source4: echomixer.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= %{version}
%if 0%{!?_without_tools:1}
@@ -36,6 +49,7 @@
* as10k1 - AS10k1 Assembler
* cspctl - Sound Blaster 16 ASP/CSP control program
+* echomixer - Mixer for Echo Audio (indigo) devices
* envy24control - Control tool for Envy24 (ice1712) based soundcards
* hdspmixer - Mixer for the RME Hammerfall DSP cards
* rmedigicontrol - Control panel for RME Hammerfall cards
@@ -77,9 +91,17 @@
%install
%{__rm} -rf $RPM_BUILD_ROOT
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/{pixmaps,applications}
+
for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
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
+ ;;
+ envy24control)
+ (cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1
+ ;;
hdspconf)
(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
;;
@@ -124,6 +146,7 @@
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/as10k1
+%doc %{_docdir}/%{name}-%{version}/echomixer
%doc %{_docdir}/%{name}-%{version}/envy24control
%doc %{_docdir}/%{name}-%{version}/hdspconf
%doc %{_docdir}/%{name}-%{version}/hdspmixer
@@ -132,6 +155,7 @@
%doc %{_docdir}/%{name}-%{version}/sb16_csp
%{_bindir}/as10k1
%{_bindir}/cspctl
+%{_bindir}/echomixer
%{_bindir}/envy24control
%{_bindir}/hdspconf
%{_bindir}/hdspmixer
@@ -139,16 +163,20 @@
%{_bindir}/sbiload
%{_bindir}/sscape_ctl
%{_bindir}/us428control
+%{_datadir}/applications/fedora-echomixer.desktop
+%{_datadir}/applications/fedora-envy24control.desktop
%{_datadir}/applications/fedora-hdspconf.desktop
%{_datadir}/applications/fedora-hdspmixer.desktop
%{_datadir}/man/man1/cspctl.1.gz
%{_datadir}/man/man1/envy24control.1.gz
+%{_datadir}/pixmaps/echomixer.png
+%{_datadir}/pixmaps/envy24control.png
%{_datadir}/pixmaps/hdspconf.png
%{_datadir}/pixmaps/hdspmixer.png
%{_datadir}/sounds/
-%endif # ?!_without_tools
+%endif
-%if 0%{?_with_firmware:1}
+%if 0%{!?_without_firmware:1}
%files firmware
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}/hdsploader
@@ -157,14 +185,29 @@
%doc %{_docdir}/%{name}-%{version}/vxloader
%{_sysconfdir}/hotplug/usb/tascam_fpga
%{_sysconfdir}/hotplug/usb/tascam_fw
-%{_sysconfdir}/hotplug/usb/tascam_fw.usermap
+%attr(0644,root,root) %{_sysconfdir}/hotplug/usb/tascam_fw.usermap
%{_bindir}/hdsploader
%{_bindir}/mixartloader
%{_bindir}/usx2yloader
%{_bindir}/vxloader
-%endif # ?_with_firmware
+%endif
%changelog
+* Thu Nov 15 2007 Tim Jackson <rpm at timj.co.uk> - 1.0.14-3
+- Update License tag to GPLv2+
+
+* Sun Oct 28 2007 Tim Jackson <rpm at timj.co.uk> - 1.0.14-2
+- Don't build -firmware subpackage again; licensing problems with
+ alsa-firmware are delaying and there is a circular dep
+- Remove bogus "echomixer" from -firmware subpackage
+
+* Sat Aug 18 2007 Tim Jackson <rpm at timj.co.uk> - 1.0.14-1
+- Update to upstream 1.0.14
+- Add icon for envy24control
+- Build echomixer
+- Enable -firmware subpackage by default, ready for firmware hitting
+ Fedora soon
+
* Sat Dec 09 2006 Tim Jackson <rpm at timj.co.uk> - 1.0.12-4
- ExcludeArch ppc (#219010)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 29 Nov 2006 21:48:41 -0000 1.8
+++ sources 15 Nov 2007 16:59:37 -0000 1.9
@@ -1 +1,5 @@
-7342056614623273abccb1cd38a674d8 alsa-tools-1.0.12-pruned.tar.bz2
+57af85a810ed770885aec2a5b35648e6 echomixer.desktop
+38db1b88c44adb5591f87173061d7d98 echomixer.png
+4c10f8d250a86bdb3ea138488aec8fc4 envy24control.desktop
+3a1a195f2b9641f68651e3d312e5476f envy24control.png
+21483d8deaec423f98ac0d21a9722c2b alsa-tools-1.0.14-pruned.tar.bz2
More information about the fedora-extras-commits
mailing list