From 11a2e1295d4bbd8c49845ede6a80e318bd797a53 Mon Sep 17 00:00:00 2001
From: gafton <gafton@fedoraproject.org>
Date: Wed, 24 Nov 2004 03:09:37 +0000
Subject: [PATCH 01/24] Fix braindead import typo artifact in the default
 generated Makefile. Oh     well, the fedora extras commits list needs a
 workout anyway...

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5bbb11d..9d3f471 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
 ifeq ($(MAKEFILE_COMMON),)
 # attept a checkout
 define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
 endef
 
 MAKEFILE_COMMON := $(shell $(checkout-makefile-common))

From 766dfc6e285e78f805f781878b0f7d4868c4ed72 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Thu, 2 Dec 2004 01:11:34 +0000
Subject: [PATCH 02/24] Disabled build, see %prep

---
 alsa-tools.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 96de15b..b08bdc5 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -1,7 +1,7 @@
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
 Version: 	1.0.4
-Release: 	0.fdr.1.1
+Release: 	1.1
 Epoch: 		0
 License: 	GPL
 Group: 		Applications/Multimedia
@@ -45,6 +45,12 @@ usx2yloader  - Second Phase Firmware loader for Tascam USX2Y USB soundcards
 # -----------------------------------------------------------------------------
 
 %prep
+echo "
+--------------------------------------------------------------
+Hasn't been built nor updated since FC1.
+Needs decision on whether to drop it.
+--------------------------------------------------------------" > /dev/null
+exit 1
 %setup -q -n %{name}-%{version}
 
 # -----------------------------------------------------------------------------

From cffacb246137c412c256d020c5a41316c1f39b19 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Thu, 3 Mar 2005 19:29:59 +0000
Subject: [PATCH 03/24] Mass letter "a" update, one or more apply : - Drop
 epoch: 0 - Remove %{epoch} requirements in sub-packages - Remove trailing
 white spaces - Keep consistent between spaces and tabs

---
 alsa-tools.spec | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index b08bdc5..3fa0efd 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -2,7 +2,6 @@ Summary: 	The ALSA Tools
 Name: 		alsa-tools
 Version: 	1.0.4
 Release: 	1.1
-Epoch: 		0
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -10,7 +9,7 @@ Source0: 	%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel alsa-driver fltk-devel automake
 BuildRequires:	alsa-lib-devel >= 0:1.0.4
-Buildrequires:  desktop-file-utils
+Buildrequires:	desktop-file-utils
 
 %package firmware
 Summary: 	Alsa-Tool to upload the firmware (needed for some soundcards)
@@ -18,8 +17,6 @@ Group: 		Applications/System
 Requires:	hotplug alsa-firmware
 
 
-# -----------------------------------------------------------------------------
-
 %description
 This package contains several tools which can be used together with
 ALSA-Drivers and -Libs. Some of this tools are only needed for special
@@ -42,8 +39,6 @@ vxloader     - for Digigram VX soundcards
 usx2yloader  - Second Phase Firmware loader for Tascam USX2Y USB soundcards
 
 
-# -----------------------------------------------------------------------------
-
 %prep
 echo "
 --------------------------------------------------------------
@@ -51,9 +46,8 @@ Hasn't been built nor updated since FC1.
 Needs decision on whether to drop it.
 --------------------------------------------------------------" > /dev/null
 exit 1
-%setup -q -n %{name}-%{version}
+%setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 mv seq/sbiload . ; rmdir seq
@@ -64,7 +58,6 @@ do
   cd ..
 done
 
-# -----------------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -72,20 +65,20 @@ done
 [ -f debugsources.list ] && rm debugsources.list
 
 for i in *
-do 
+do
    case $i in
       hdspconf)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       hdspmixer)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       usx2yloader)
-	(cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
+        (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
         ;;
       *) (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
@@ -93,7 +86,7 @@ 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
@@ -102,7 +95,7 @@ do
       cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
    fi
 
-  
+
 done
 
 for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do
@@ -113,12 +106,10 @@ for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do
       $f
 done
 
-# -----------------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -162,7 +153,6 @@ done
 %{_bindir}/usx2yloader
 %{_bindir}/vxloader
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1

From bf01a5574acaa6eec70914400f23102a2b319bd3 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Thu, 3 Mar 2005 19:45:26 +0000
Subject: [PATCH 04/24] Remove missed alsa-lib-devel zero epoch spotted by
 Michael.

---
 alsa-tools.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 3fa0efd..937f703 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -8,7 +8,7 @@ URL: 		http://www.alsa-project.org/
 Source0: 	%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel alsa-driver fltk-devel automake
-BuildRequires:	alsa-lib-devel >= 0:1.0.4
+BuildRequires:	alsa-lib-devel >= 1.0.4
 Buildrequires:	desktop-file-utils
 
 %package firmware

From 23ac205caae1e88233e3801df10c6918087fb532 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Fri, 8 Apr 2005 15:06:28 +0000
Subject: [PATCH 05/24] Bring alsa-tools in line with the version already in
 extras-FC-3. Also: Wed Apr 06 2005 Thorsten Leemhuis
 <fedora[AT]leemhuis.info> - 1.0.8-1 - Update to 1.0.8

---
 .cvsignore                     |   2 +-
 alsa-tools-as10k1gcc_fix.patch |  11 ++++
 alsa-tools.spec                | 100 ++++++++++++++++++---------------
 sources                        |   2 +-
 4 files changed, 69 insertions(+), 46 deletions(-)
 create mode 100644 alsa-tools-as10k1gcc_fix.patch

diff --git a/.cvsignore b/.cvsignore
index 20605b4..6678edd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alsa-tools-1.0.4.tar.bz2
+alsa-tools-1.0.8.tar.bz2
diff --git a/alsa-tools-as10k1gcc_fix.patch b/alsa-tools-as10k1gcc_fix.patch
new file mode 100644
index 0000000..9c68326
--- /dev/null
+++ b/alsa-tools-as10k1gcc_fix.patch
@@ -0,0 +1,11 @@
+--- as10k1/as10k1.c.org	2004-12-19 19:30:31.944508232 +0100
++++ as10k1/as10k1.c	2004-12-19 19:30:45.336472344 +0100
+@@ -159,7 +159,7 @@
+ 
+ 		}
+ next_cli_arg:
+-
++	;
+ 	}
+ }
+ 
diff --git a/alsa-tools.spec b/alsa-tools.spec
index 937f703..5cf762b 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -1,21 +1,23 @@
+%{?!_without_tools: 	%define builddirstools ac3dec 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 }
+
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
-Version: 	1.0.4
-Release: 	1.1
+Version: 	1.0.8
+Release: 	1
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
-Source0: 	%{name}-%{version}.tar.bz2
+Source0: 	ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-as10k1gcc_fix.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk+-devel alsa-driver fltk-devel automake
-BuildRequires:	alsa-lib-devel >= 1.0.4
-Buildrequires:	desktop-file-utils
-
-%package firmware
-Summary: 	Alsa-Tool to upload the firmware (needed for some soundcards)
-Group: 		Applications/System
-Requires:	hotplug alsa-firmware
-
+BuildRequires:	alsa-lib-devel >= %{version}
+%if 0%{!?_without_tools:1}
+BuildRequires:	gtk+-devel 
+BuildRequires:	fltk-devel 
+Buildrequires:  desktop-file-utils
+%endif
 
 %description
 This package contains several tools which can be used together with
@@ -29,6 +31,14 @@ Some Noteable:
 * sbiload - An OPL2/3 FM instrument loader for ALSA sequencer
 * sscape_ctl - ALSA SoundScape control utility
 
+
+
+%package firmware
+Summary: 	Alsa-Tool to upload the firmware (needed for some soundcards)
+Group: 		Applications/System
+Requires:	hotplug alsa-firmware
+
+
 %description firmware
 This package contains several tools which will flash the firmware into the
 Soundcards. The following tools are available:
@@ -40,18 +50,13 @@ usx2yloader  - Second Phase Firmware loader for Tascam USX2Y USB soundcards
 
 
 %prep
-echo "
---------------------------------------------------------------
-Hasn't been built nor updated since FC1.
-Needs decision on whether to drop it.
---------------------------------------------------------------" > /dev/null
-exit 1
-%setup -q
+%setup -q -n %{name}-%{version}
+%patch0 -b .patch0
 
 
 %build
 mv seq/sbiload . ; rmdir seq
-for i in *
+for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
 do
   cd $i ; %configure
   %{__make} %{?_smp_mflags} || exit 1
@@ -61,24 +66,22 @@ done
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-[ -f debugfiles.list ] && rm debugfiles.list
-[ -f debugsources.list ] && rm debugsources.list
 
-for i in *
-do
+for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
+do 
    case $i in
       hdspconf)
-        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       hdspmixer)
-        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       usx2yloader)
-        (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
+	(cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
         ;;
       *) (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
@@ -86,31 +89,27 @@ 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 
+   if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then
+      desktop-file-install --vendor fedora \
+        --add-category "X-Fedora" \
+        --delete-original \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop
    fi
-
-
 done
 
-for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do
-    desktop-file-install --vendor fedora \
-      --add-category "X-Fedora" \
-      --delete-original \
-      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-      $f
-done
-
-
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-
+%if 0%{!?_without_tools:1}
 %files
 %defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/ac3dec
@@ -138,7 +137,10 @@ done
 %{_datadir}/man/man1/envy24control.1.gz
 %{_datadir}/pixmaps/hdspconf.png
 %{_datadir}/pixmaps/hdspmixer.png
+%{_datadir}/sounds/
+%endif # ?!_without_tools
 
+%if 0%{?_with_firmware:1}
 %files firmware
 %defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/hdsploader
@@ -152,9 +154,21 @@ done
 %{_bindir}/mixartloader
 %{_bindir}/usx2yloader
 %{_bindir}/vxloader
-
+%endif # ?_with_firmware
 
 %changelog
+* Wed Apr 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-1
+- Update to 1.0.8
+
+* Sun Mar 29 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.6-2
+- Add "--without tools" and "--with firmware" options
+- Drop unneeded BR: automake
+
+* Sun Jan 02 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.6-0.fdr.1
+- Update to 1.0.6 for FC3
+- add new files in {_datadir}/sounds/
+- add patch0 for as10k1 
+
 * Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1
 - Update to 1.0.4
 
@@ -183,5 +197,3 @@ done
 
 * Wed Aug 13 2003 Dams <anvil[AT]livna.org> 0:tools-0.fdr.1
 - Initial build.
-
-
diff --git a/sources b/sources
index d31da0f..7e28b33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c901a79e60a42f82f07f7a77cb45691a  alsa-tools-1.0.4.tar.bz2
+cf51eccd14e818a9f0be455cedcd52ff  alsa-tools-1.0.8.tar.bz2

From 41393b66d77c94d4a2b8810fa8a0964f60e05fd4 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Thu, 5 May 2005 13:52:00 +0000
Subject: [PATCH 06/24] don't build ac3dec -- use a52dec instead

---
 alsa-tools.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 5cf762b..fd57735 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -1,11 +1,11 @@
-%{?!_without_tools: 	%define builddirstools ac3dec as10k1 envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
+%{?!_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 }
 
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
 Version: 	1.0.8
-Release: 	1
+Release: 	2
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -26,7 +26,6 @@ Sound-Cards or -Chips.
 
 Some Noteable:
 
-* ac3dec - A free AC-3 stream decoder
 * cspctl - Sound Blaster 16 ASP/CSP control program
 * sbiload - An OPL2/3 FM instrument loader for ALSA sequencer
 * sscape_ctl - ALSA SoundScape control utility
@@ -112,7 +111,6 @@ done
 %if 0%{!?_without_tools:1}
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/ac3dec
 %doc %{_docdir}/%{name}-%{version}/as10k1
 %doc %{_docdir}/%{name}-%{version}/envy24control
 %doc %{_docdir}/%{name}-%{version}/hdspconf
@@ -120,11 +118,9 @@ done
 %doc %{_docdir}/%{name}-%{version}/rmedigicontrol
 %doc %{_docdir}/%{name}-%{version}/sbiload
 %doc %{_docdir}/%{name}-%{version}/sb16_csp
-%{_bindir}/ac3dec
 %{_bindir}/as10k1
 %{_bindir}/cspctl
 %{_bindir}/envy24control
-%{_bindir}/extract_ac3
 %{_bindir}/hdspconf
 %{_bindir}/hdspmixer
 %{_bindir}/rmedigicontrol
@@ -157,6 +153,9 @@ done
 %endif # ?_with_firmware
 
 %changelog
+* Wed Apr 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-2
+- don't build ac3dec -- use a52dec instead
+
 * Wed Apr 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-1
 - Update to 1.0.8
 

From 49c521b854518e4f2b84b1f4eb871ada0aeaa27c Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Fri, 6 May 2005 16:28:09 +0000
Subject: [PATCH 07/24] prune ac3dec from sources

---
 .cvsignore      | 2 +-
 alsa-tools.spec | 9 ++++++---
 sources         | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6678edd..7118786 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alsa-tools-1.0.8.tar.bz2
+alsa-tools-1.0.8-pruned.tar.bz2
diff --git a/alsa-tools.spec b/alsa-tools.spec
index fd57735..44a4d7f 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -5,11 +5,11 @@
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
 Version: 	1.0.8
-Release: 	2
+Release: 	3
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
-Source0: 	ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2
+Source0: 	%{name}-%{version}-pruned.tar.bz2
 Patch0:		%{name}-as10k1gcc_fix.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
@@ -153,7 +153,10 @@ done
 %endif # ?_with_firmware
 
 %changelog
-* Wed Apr 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-2
+* Fri May 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-3
+- prune ac3dec from sources
+
+* Thu May 05 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-2
 - don't build ac3dec -- use a52dec instead
 
 * Wed Apr 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-1
diff --git a/sources b/sources
index 7e28b33..87a4610 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf51eccd14e818a9f0be455cedcd52ff  alsa-tools-1.0.8.tar.bz2
+4c58d608c3144785761def1fb66bef9d  alsa-tools-1.0.8-pruned.tar.bz2

From 2ff27bd0a141b54c7d25a2ac1d6f11043d4007cc Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Mon, 27 Jun 2005 14:44:41 +0000
Subject: [PATCH 08/24] Update to 1.0.9

---
 .cvsignore                     |  2 +-
 alsa-tools-as10k1gcc_fix.patch | 11 -----------
 alsa-tools.spec                | 11 +++++++----
 sources                        |  2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 alsa-tools-as10k1gcc_fix.patch

diff --git a/.cvsignore b/.cvsignore
index 7118786..6e14ad4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alsa-tools-1.0.8-pruned.tar.bz2
+alsa-tools-1.0.9-pruned.tar.bz2
diff --git a/alsa-tools-as10k1gcc_fix.patch b/alsa-tools-as10k1gcc_fix.patch
deleted file mode 100644
index 9c68326..0000000
--- a/alsa-tools-as10k1gcc_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- as10k1/as10k1.c.org	2004-12-19 19:30:31.944508232 +0100
-+++ as10k1/as10k1.c	2004-12-19 19:30:45.336472344 +0100
-@@ -159,7 +159,7 @@
- 
- 		}
- next_cli_arg:
--
-+	;
- 	}
- }
- 
diff --git a/alsa-tools.spec b/alsa-tools.spec
index 44a4d7f..c1ed6c6 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -4,13 +4,12 @@
 
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
-Version: 	1.0.8
-Release: 	3
+Version: 	1.0.9
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
 Source0: 	%{name}-%{version}-pruned.tar.bz2
-Patch0:		%{name}-as10k1gcc_fix.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 %if 0%{!?_without_tools:1}
@@ -50,7 +49,6 @@ usx2yloader  - Second Phase Firmware loader for Tascam USX2Y USB soundcards
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -b .patch0
 
 
 %build
@@ -153,6 +151,11 @@ done
 %endif # ?_with_firmware
 
 %changelog
+* Fri May 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.9-1
+- Update to 1.0.9
+- Use disttag
+- Remove gcc4 patch
+
 * Fri May 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-3
 - prune ac3dec from sources
 
diff --git a/sources b/sources
index 87a4610..d45a161 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c58d608c3144785761def1fb66bef9d  alsa-tools-1.0.8-pruned.tar.bz2
+0151eb036e97d46bdee972cfdb433149  alsa-tools-1.0.9-pruned.tar.bz2

From decaae00e15b920e823ac2fcdd972a66e4cc2db9 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Tue, 6 Dec 2005 18:55:02 +0000
Subject: [PATCH 09/24] Update to 1.0.10

---
 .cvsignore      | 2 +-
 alsa-tools.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6e14ad4..8ad1b14 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alsa-tools-1.0.9-pruned.tar.bz2
+alsa-tools-1.0.10-pruned.tar.bz2
diff --git a/alsa-tools.spec b/alsa-tools.spec
index c1ed6c6..7e660c6 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -4,7 +4,7 @@
 
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
-Version: 	1.0.9
+Version: 	1.0.10
 Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
@@ -151,6 +151,9 @@ done
 %endif # ?_with_firmware
 
 %changelog
+* Tue Dec 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.10-1
+- Update to 1.0.10
+
 * Fri May 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.9-1
 - Update to 1.0.9
 - Use disttag
diff --git a/sources b/sources
index d45a161..4a8f9e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0151eb036e97d46bdee972cfdb433149  alsa-tools-1.0.9-pruned.tar.bz2
+dd280ae7294b3021438986ca54df9ca5  alsa-tools-1.0.10-pruned.tar.bz2

From 9cab7aa0e6d42ec0c1b201bc81e5348abecfff28 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Mon, 13 Feb 2006 17:31:16 +0000
Subject: [PATCH 10/24] increase release for Fedora Extras 5 rebuild

---
 alsa-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 7e660c6..1c391ea 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -5,7 +5,7 @@
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
 Version: 	1.0.10
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -151,6 +151,9 @@ done
 %endif # ?_with_firmware
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+- Rebuild for Fedora Extras 5
+
 * Tue Dec 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.10-1
 - Update to 1.0.10
 

From 6308502df4d4982c7ac2134d8d2512fa85133eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 27 Aug 2006 20:14:49 +0000
Subject: [PATCH 11/24] 
 http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

---
 needs.rebuild | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 needs.rebuild

diff --git a/needs.rebuild b/needs.rebuild
new file mode 100644
index 0000000..815fd29
--- /dev/null
+++ b/needs.rebuild
@@ -0,0 +1 @@
+http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

From a4b55619bac15235a74e2b9ade964867481689aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 11 Oct 2006 21:30:57 +0000
Subject: [PATCH 12/24] 
 http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

---
 .cvsignore                    |   1 -
 Makefile                      |  21 ----
 alsa-tools.spec               | 210 ----------------------------------
 needs.rebuild => dead.package |   0
 sources                       |   1 -
 5 files changed, 233 deletions(-)
 delete mode 100644 .cvsignore
 delete mode 100644 Makefile
 delete mode 100644 alsa-tools.spec
 rename needs.rebuild => dead.package (100%)
 delete mode 100644 sources

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 8ad1b14..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-alsa-tools-1.0.10-pruned.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9d3f471..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: alsa-tools
-# $Id$
-NAME := alsa-tools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/alsa-tools.spec b/alsa-tools.spec
deleted file mode 100644
index 1c391ea..0000000
--- a/alsa-tools.spec
+++ /dev/null
@@ -1,210 +0,0 @@
-%{?!_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 }
-
-Summary: 	The ALSA Tools
-Name: 		alsa-tools
-Version: 	1.0.10
-Release: 	2%{?dist}
-License: 	GPL
-Group: 		Applications/Multimedia
-URL: 		http://www.alsa-project.org/
-Source0: 	%{name}-%{version}-pruned.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	alsa-lib-devel >= %{version}
-%if 0%{!?_without_tools:1}
-BuildRequires:	gtk+-devel 
-BuildRequires:	fltk-devel 
-Buildrequires:  desktop-file-utils
-%endif
-
-%description
-This package contains several tools which can be used together with
-ALSA-Drivers and -Libs. Some of this tools are only needed for special
-Sound-Cards or -Chips.
-
-Some Noteable:
-
-* cspctl - Sound Blaster 16 ASP/CSP control program
-* sbiload - An OPL2/3 FM instrument loader for ALSA sequencer
-* sscape_ctl - ALSA SoundScape control utility
-
-
-
-%package firmware
-Summary: 	Alsa-Tool to upload the firmware (needed for some soundcards)
-Group: 		Applications/System
-Requires:	hotplug alsa-firmware
-
-
-%description firmware
-This package contains several tools which will flash the firmware into the
-Soundcards. The following tools are available:
-
-hdsploader   - for the RME Hammerfall DSP cards
-mixartloader - for Digigram miXart soundcards
-vxloader     - for Digigram VX soundcards
-usx2yloader  - Second Phase Firmware loader for Tascam USX2Y USB soundcards
-
-
-%prep
-%setup -q -n %{name}-%{version}
-
-
-%build
-mv seq/sbiload . ; rmdir seq
-for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
-do
-  cd $i ; %configure
-  %{__make} %{?_smp_mflags} || exit 1
-  cd ..
-done
-
-
-%install
-%{__rm} -rf $RPM_BUILD_ROOT
-
-for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
-do 
-   case $i in
-      hdspconf)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
-        ;;
-      hdspmixer)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
-        ;;
-      usx2yloader)
-	(cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
-        ;;
-      *) (cd $i ; %makeinstall) || exit 1
-   esac
-   if [[ -s "${i}"/README ]] 
-   then
-      if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
-      then
-         mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
-      fi
-      cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
-   fi
-   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 
-   if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then
-      desktop-file-install --vendor fedora \
-        --add-category "X-Fedora" \
-        --delete-original \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop
-   fi
-done
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%if 0%{!?_without_tools:1}
-%files
-%defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/as10k1
-%doc %{_docdir}/%{name}-%{version}/envy24control
-%doc %{_docdir}/%{name}-%{version}/hdspconf
-%doc %{_docdir}/%{name}-%{version}/hdspmixer
-%doc %{_docdir}/%{name}-%{version}/rmedigicontrol
-%doc %{_docdir}/%{name}-%{version}/sbiload
-%doc %{_docdir}/%{name}-%{version}/sb16_csp
-%{_bindir}/as10k1
-%{_bindir}/cspctl
-%{_bindir}/envy24control
-%{_bindir}/hdspconf
-%{_bindir}/hdspmixer
-%{_bindir}/rmedigicontrol
-%{_bindir}/sbiload
-%{_bindir}/sscape_ctl
-%{_bindir}/us428control
-%{_datadir}/applications/fedora-hdspconf.desktop
-%{_datadir}/applications/fedora-hdspmixer.desktop
-%{_datadir}/man/man1/cspctl.1.gz
-%{_datadir}/man/man1/envy24control.1.gz
-%{_datadir}/pixmaps/hdspconf.png
-%{_datadir}/pixmaps/hdspmixer.png
-%{_datadir}/sounds/
-%endif # ?!_without_tools
-
-%if 0%{?_with_firmware:1}
-%files firmware
-%defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/hdsploader
-%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
-%{_sysconfdir}/hotplug/usb/tascam_fw.usermap
-%{_bindir}/hdsploader
-%{_bindir}/mixartloader
-%{_bindir}/usx2yloader
-%{_bindir}/vxloader
-%endif # ?_with_firmware
-
-%changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
-- Rebuild for Fedora Extras 5
-
-* Tue Dec 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.10-1
-- Update to 1.0.10
-
-* Fri May 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.9-1
-- Update to 1.0.9
-- Use disttag
-- Remove gcc4 patch
-
-* Fri May 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-3
-- prune ac3dec from sources
-
-* Thu May 05 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-2
-- don't build ac3dec -- use a52dec instead
-
-* Wed Apr 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-1
-- Update to 1.0.8
-
-* Sun Mar 29 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.6-2
-- Add "--without tools" and "--with firmware" options
-- Drop unneeded BR: automake
-
-* Sun Jan 02 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.6-0.fdr.1
-- Update to 1.0.6 for FC3
-- add new files in {_datadir}/sounds/
-- add patch0 for as10k1 
-
-* Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1
-- Update to 1.0.4
-
-* Fri Jan 16 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.1-0.fdr.2
-- Integrate Michaels patch that fixes:
-- fix desktop files for fedora.us, adds buildreq desktop-file-utils
-- fix %%install section for short-circuit installs
-
-* Fri Jan 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.1-0.fdr.1
-- Update to 1.0.1
-
-* Sun Dec 14 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.0-0.fdr.0.3.rc2
-- exit if error during build or install
-- fix install errors hdspconf, hdspmixer, usx2yloader
-- Split package in alsa-tools and alsa-tools-firmware
-- Integrate more docs
-
-* Fri Dec 06 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.0-0.fdr.0.2.rc2
-- Update to 1.0.0rc2
-- some minor corrections in style
-
-* Thu Dec 04 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.0-0.fdr.0.1.rc1
-- Update to 1.0.0rc1
-- Remove firmware files -- extra package now.
-- Add description
-
-* Wed Aug 13 2003 Dams <anvil[AT]livna.org> 0:tools-0.fdr.1
-- Initial build.
diff --git a/needs.rebuild b/dead.package
similarity index 100%
rename from needs.rebuild
rename to dead.package
diff --git a/sources b/sources
deleted file mode 100644
index 4a8f9e4..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-dd280ae7294b3021438986ca54df9ca5  alsa-tools-1.0.10-pruned.tar.bz2

From edde2a36a5e8275d3398f97d5fdb52fc4cc08fa5 Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Wed, 29 Nov 2006 21:48:41 +0000
Subject: [PATCH 13/24] Unorphan alsa-tools (#217256)

---
 Makefile        |  21 +++++
 alsa-tools.spec | 228 ++++++++++++++++++++++++++++++++++++++++++++++++
 dead.package    |   1 -
 sources         |   1 +
 4 files changed, 250 insertions(+), 1 deletion(-)
 create mode 100644 Makefile
 create mode 100644 alsa-tools.spec
 delete mode 100644 dead.package
 create mode 100644 sources

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9d3f471
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+# Makefile for source rpm: alsa-tools
+# $Id$
+NAME := alsa-tools
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
diff --git a/alsa-tools.spec b/alsa-tools.spec
new file mode 100644
index 0000000..07c8436
--- /dev/null
+++ b/alsa-tools.spec
@@ -0,0 +1,228 @@
+%{?!_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 }
+
+# The source tarball has been pruned to remove the "ac3dec" directory, due
+# to legal concerns that the contents might be subject to patent claims
+
+Summary:        Specialist tools for ALSA
+Name:           alsa-tools
+Version:        1.0.12
+Release:        3%{?dist}
+License:        GPL
+Group:          Applications/Multimedia
+URL:            http://www.alsa-project.org/
+Source0:        %{name}-%{version}-pruned.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  alsa-lib-devel >= %{version}
+%if 0%{!?_without_tools:1}
+BuildRequires:  gtk+-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  fltk-devel
+Buildrequires:  desktop-file-utils
+%endif
+
+%description
+This package contains several specialist tools for use with ALSA, including
+a number of programs that provide access to special hardware facilities on
+certain sound cards.
+
+* as10k1 - AS10k1 Assembler
+* cspctl - Sound Blaster 16 ASP/CSP control program
+* envy24control - Control tool for Envy24 (ice1712) based soundcards
+* hdspmixer - Mixer for the RME Hammerfall DSP cards
+* rmedigicontrol - Control panel for RME Hammerfall cards
+* sbiload - An OPL2/3 FM instrument loader for ALSA sequencer
+* sscape_ctl - ALSA SoundScape control utility
+* us428control - Control tool for Tascam 428
+
+
+%package firmware
+Summary:        ALSA tools for uploading firmware to some soundcards
+Group:          Applications/System
+Requires:       udev alsa-firmware
+
+
+%description firmware
+This package contains tools for flashing firmware into certain sound cards.
+The following tools are available:
+
+* hdsploader   - for RME Hammerfall DSP cards
+* mixartloader - for Digigram miXart soundcards
+* vxloader     - for Digigram VX soundcards
+* usx2yloader  - second phase firmware loader for Tascam USX2Y USB soundcards
+
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+mv seq/sbiload . ; rmdir seq
+for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
+do
+  cd $i ; %configure
+  %{__make} %{?_smp_mflags} || exit 1
+  cd ..
+done
+
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+
+for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
+do 
+  case $i in
+    hdspconf)
+      (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+      ;;
+    hdspmixer)
+      (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+      ;;
+    usx2yloader)
+      (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
+      ;;
+    *) (cd $i ; %makeinstall) || exit 1
+   esac
+   if [[ -s "${i}"/README ]] 
+   then
+      if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
+      then
+         mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+      fi
+      cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+   fi
+   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 
+   if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then
+      desktop-file-install --vendor fedora \
+        --add-category "X-Fedora" \
+        --delete-original \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop
+   fi
+done
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%if 0%{!?_without_tools:1}
+%files
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/as10k1
+%doc %{_docdir}/%{name}-%{version}/envy24control
+%doc %{_docdir}/%{name}-%{version}/hdspconf
+%doc %{_docdir}/%{name}-%{version}/hdspmixer
+%doc %{_docdir}/%{name}-%{version}/rmedigicontrol
+%doc %{_docdir}/%{name}-%{version}/sbiload
+%doc %{_docdir}/%{name}-%{version}/sb16_csp
+%{_bindir}/as10k1
+%{_bindir}/cspctl
+%{_bindir}/envy24control
+%{_bindir}/hdspconf
+%{_bindir}/hdspmixer
+%{_bindir}/rmedigicontrol
+%{_bindir}/sbiload
+%{_bindir}/sscape_ctl
+%{_bindir}/us428control
+%{_datadir}/applications/fedora-hdspconf.desktop
+%{_datadir}/applications/fedora-hdspmixer.desktop
+%{_datadir}/man/man1/cspctl.1.gz
+%{_datadir}/man/man1/envy24control.1.gz
+%{_datadir}/pixmaps/hdspconf.png
+%{_datadir}/pixmaps/hdspmixer.png
+%{_datadir}/sounds/
+%endif # ?!_without_tools
+
+%if 0%{?_with_firmware:1}
+%files firmware
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/hdsploader
+%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
+%{_sysconfdir}/hotplug/usb/tascam_fw.usermap
+%{_bindir}/hdsploader
+%{_bindir}/mixartloader
+%{_bindir}/usx2yloader
+%{_bindir}/vxloader
+%endif # ?_with_firmware
+
+%changelog
+* Sun Nov 26 2006 Tim Jackson <rpm@timj.co.uk> - 1.0.12-3
+- Add gtk2-devel BR
+
+* Sun Nov 26 2006 Tim Jackson <rpm@timj.co.uk> - 1.0.12-2
+- Own our docdir explicitly
+
+* Sat Nov 25 2006 Tim Jackson <rpm@timj.co.uk> - 1.0.12-1
+- Update to 1.0.12
+- Resubmit to Fedora Extras 6
+- Replace hotplug requirement with udev
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+- Rebuild for Fedora Extras 5
+
+* Tue Dec 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.10-1
+- Update to 1.0.10
+
+* Fri May 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.9-1
+- Update to 1.0.9
+- Use disttag
+- Remove gcc4 patch
+
+* Fri May 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-3
+- prune ac3dec from sources
+
+* Thu May 05 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-2
+- don't build ac3dec -- use a52dec instead
+
+* Wed Apr 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8-1
+- Update to 1.0.8
+
+* Sun Mar 29 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.6-2
+- Add "--without tools" and "--with firmware" options
+- Drop unneeded BR: automake
+
+* Sun Jan 02 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.6-0.fdr.1
+- Update to 1.0.6 for FC3
+- add new files in {_datadir}/sounds/
+- add patch0 for as10k1 
+
+* Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1
+- Update to 1.0.4
+
+* Fri Jan 16 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.1-0.fdr.2
+- Integrate Michaels patch that fixes:
+- fix desktop files for fedora.us, adds buildreq desktop-file-utils
+- fix %%install section for short-circuit installs
+
+* Fri Jan 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.1-0.fdr.1
+- Update to 1.0.1
+
+* Sun Dec 14 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.0-0.fdr.0.3.rc2
+- exit if error during build or install
+- fix install errors hdspconf, hdspmixer, usx2yloader
+- Split package in alsa-tools and alsa-tools-firmware
+- Integrate more docs
+
+* Fri Dec 06 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.0-0.fdr.0.2.rc2
+- Update to 1.0.0rc2
+- some minor corrections in style
+
+* Thu Dec 04 2003 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.0-0.fdr.0.1.rc1
+- Update to 1.0.0rc1
+- Remove firmware files -- extra package now.
+- Add description
+
+* Wed Aug 13 2003 Dams <anvil[AT]livna.org> 0:tools-0.fdr.1
+- Initial build.
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 815fd29..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
diff --git a/sources b/sources
new file mode 100644
index 0000000..86cb334
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+7342056614623273abccb1cd38a674d8  alsa-tools-1.0.12-pruned.tar.bz2

From 1d2a549eede9218c128cc7dc15999bbe9d66756f Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Sat, 9 Dec 2006 10:01:32 +0000
Subject: [PATCH 14/24] ExcludeArch ppc (#219010)

---
 alsa-tools.spec | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 07c8436..7aab26b 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -5,10 +5,14 @@
 # The source tarball has been pruned to remove the "ac3dec" directory, due
 # to legal concerns that the contents might be subject to patent claims
 
+# Note that the Version is intended to coincide with the version of ALSA
+# included with the Fedora kernel, rather than necessarily the very latest
+# upstream version of alsa-tools
+
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
 Version:        1.0.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://www.alsa-project.org/
@@ -22,6 +26,9 @@ BuildRequires:  fltk-devel
 Buildrequires:  desktop-file-utils
 %endif
 
+# Doesn't build on PPC; see bug #219010
+ExcludeArch:    ppc
+
 %description
 This package contains several specialist tools for use with ALSA, including
 a number of programs that provide access to special hardware facilities on
@@ -158,6 +165,9 @@ done
 %endif # ?_with_firmware
 
 %changelog
+* Sat Dec 09 2006 Tim Jackson <rpm@timj.co.uk> - 1.0.12-4
+- ExcludeArch ppc (#219010)
+
 * Sun Nov 26 2006 Tim Jackson <rpm@timj.co.uk> - 1.0.12-3
 - Add gtk2-devel BR
 

From dc9e6dfb3311d4f21b39662478b2c0ab2356a80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?=
 <toshio@fedoraproject.org>
Date: Sat, 20 Oct 2007 15:43:33 +0000
Subject: [PATCH 15/24] Initialize branch F-8 for alsa-tools

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..e9e7ccd
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-8

From 9c260d997dcad39429cb402be9ffb5479e8a0bc2 Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Sat, 5 Jan 2008 11:59:01 +0000
Subject: [PATCH 16/24] Update to upstream alsa-tools 1.0.15

---
 alsa-tools.spec | 48 +++++++++++++++++++++++++++++++++++++++---------
 sources         |  6 +++++-
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 7aab26b..3dbfe6e 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -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,19 @@
 
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
-Version:        1.0.12
-Release:        4%{?dist}
+Version:        1.0.15
+Release:        1%{?dist}
 License:        GPL
 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 +46,7 @@ certain sound cards.
 
 * 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 +88,17 @@ done
 %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 +143,7 @@ done
 %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 +152,7 @@ done
 %doc %{_docdir}/%{name}-%{version}/sb16_csp
 %{_bindir}/as10k1
 %{_bindir}/cspctl
+%{_bindir}/echomixer
 %{_bindir}/envy24control
 %{_bindir}/hdspconf
 %{_bindir}/hdspmixer
@@ -139,16 +160,20 @@ done
 %{_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 +182,19 @@ done
 %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
+* Sat Jan 05 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-1
+- Update to upstream 1.0.15
+- Add icon for envy24control
+- Build echomixer
+
 * Sat Dec 09 2006 Tim Jackson <rpm@timj.co.uk> - 1.0.12-4
 - ExcludeArch ppc (#219010)
 
diff --git a/sources b/sources
index 86cb334..a1ecd62 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
-7342056614623273abccb1cd38a674d8  alsa-tools-1.0.12-pruned.tar.bz2
+57af85a810ed770885aec2a5b35648e6  echomixer.desktop
+38db1b88c44adb5591f87173061d7d98  echomixer.png
+4c10f8d250a86bdb3ea138488aec8fc4  envy24control.desktop
+3a1a195f2b9641f68651e3d312e5476f  envy24control.png
+2ab2677de89c5fd0e769b212f206101a  alsa-tools-1.0.15-pruned.tar.bz2

From 28ec5928929ddb8c5b03f5768820fdabf49af6bf Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Sat, 5 Jan 2008 12:08:13 +0000
Subject: [PATCH 17/24] Update License tag to GPLv2+ ExcludeArch ppc64 (bug
 #219010)

---
 alsa-tools.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 3dbfe6e..087c906 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -15,8 +15,11 @@
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
 Version:        1.0.15
-Release:        1%{?dist}
-License:        GPL
+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
+License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.alsa-project.org/
 Source0:        %{name}-%{version}-pruned.tar.bz2
@@ -37,7 +40,7 @@ Buildrequires:  desktop-file-utils
 %endif
 
 # Doesn't build on PPC; see bug #219010
-ExcludeArch:    ppc
+ExcludeArch:    ppc ppc64
 
 %description
 This package contains several specialist tools for use with ALSA, including
@@ -190,6 +193,10 @@ done
 %endif
 
 %changelog
+* Sat Jan 05 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-2
+- Update License tag to GPLv2+
+- ExcludeArch ppc64 (bug #219010)
+
 * Sat Jan 05 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-1
 - Update to upstream 1.0.15
 - Add icon for envy24control

From c21dc55ff1ee5aadbc7192128d58cbde35ff66bc Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Sat, 5 Jan 2008 12:09:49 +0000
Subject: [PATCH 18/24] Ignore source files

---
 .cvsignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .cvsignore

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..d2b74f6
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,5 @@
+alsa-tools-1.0.15-pruned.tar.bz2
+envy24control.png
+envy24control.desktop
+echomixer.png
+echomixer.desktop

From d823fb0906c285c8374848976b9af67114b55c3a Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Sun, 18 May 2008 16:29:47 +0000
Subject: [PATCH 19/24] Enable -firmware subpackage

---
 alsa-tools.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 087c906..14c6972 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -1,6 +1,6 @@
-# Disable firmware build for now; the alsa-firmware package is not built
-# for Fedora yet (bug #217259)
-%define _without_firmware 1
+# Whether or not to skip building the firmware subpackage. This is not the
+# actual firmware itself (see alsa-firmware), it is some complementary tools.
+%define _without_firmware 0
 
 %{?!_without_tools:     %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
 %{?!_without_firmware:  %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
@@ -15,7 +15,7 @@
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
 Version:        1.0.15
-Release:        2%{?dist}
+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
@@ -193,6 +193,10 @@ done
 %endif
 
 %changelog
+* Sun May 18 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-3
+- Enable firmware subpackage - the accompanying alsa-firmware package is
+  finally in Fedora
+
 * Sat Jan 05 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-2
 - Update License tag to GPLv2+
 - ExcludeArch ppc64 (bug #219010)

From eaf60ead6beabfce5711dbfd3d4b57218f8dcc44 Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Sun, 18 May 2008 21:47:56 +0000
Subject: [PATCH 20/24] Really enable -firmware subpackage

---
 alsa-tools.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 14c6972..1b8ddb2 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -1,6 +1,8 @@
-# Whether or not to skip building the firmware subpackage. This is not the
-# actual firmware itself (see alsa-firmware), it is some complementary tools.
-%define _without_firmware 0
+# If you want to skip building the firmware subpackage, define the macro
+# _without_firmware to 1. This is not the actual firmware itself 
+# (see alsa-firmware), it is some complementary tools.
+# Do *NOT* set it to zero or have a commented out define here, or it will not
+# work. (RPM spec file voodoo)
 
 %{?!_without_tools:     %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
 %{?!_without_firmware:  %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
@@ -15,7 +17,7 @@
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
 Version:        1.0.15
-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
@@ -193,6 +195,9 @@ done
 %endif
 
 %changelog
+* Sun May 18 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-4
+- Really enable firmware subpackage
+
 * Sun May 18 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-3
 - Enable firmware subpackage - the accompanying alsa-firmware package is
   finally in Fedora

From 07608986b365cd320a8047ae8a44298ac986b15e Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Mon, 19 May 2008 21:32:03 +0000
Subject: [PATCH 21/24] Make it build cleanly on ppc and ppc64 by excluding
 sb16_csp

---
 alsa-tools.spec | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 1b8ddb2..a06059a 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -4,7 +4,13 @@
 # Do *NOT* set it to zero or have a commented out define here, or it will not
 # work. (RPM spec file voodoo)
 
+%ifarch ppc ppc64
+# sb16_csp doesn't build on PPC; see bug #219010
+%{?!_without_tools:     %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sscape_ctl us428control }
+%else
 %{?!_without_tools:     %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
+%endif
+
 %{?!_without_firmware:  %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
 
 # The source tarball has been pruned to remove the "ac3dec" directory, due
@@ -17,7 +23,7 @@
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
 Version:        1.0.15
-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
@@ -41,16 +47,15 @@ BuildRequires:  fltk-devel
 Buildrequires:  desktop-file-utils
 %endif
 
-# Doesn't build on PPC; see bug #219010
-ExcludeArch:    ppc ppc64
-
 %description
 This package contains several specialist tools for use with ALSA, including
 a number of programs that provide access to special hardware facilities on
 certain sound cards.
 
 * as10k1 - AS10k1 Assembler
+%ifnarch ppc ppc64
 * cspctl - Sound Blaster 16 ASP/CSP control program
+%endif
 * echomixer - Mixer for Echo Audio (indigo) devices
 * envy24control - Control tool for Envy24 (ice1712) based soundcards
 * hdspmixer - Mixer for the RME Hammerfall DSP cards
@@ -154,9 +159,7 @@ done
 %doc %{_docdir}/%{name}-%{version}/hdspmixer
 %doc %{_docdir}/%{name}-%{version}/rmedigicontrol
 %doc %{_docdir}/%{name}-%{version}/sbiload
-%doc %{_docdir}/%{name}-%{version}/sb16_csp
 %{_bindir}/as10k1
-%{_bindir}/cspctl
 %{_bindir}/echomixer
 %{_bindir}/envy24control
 %{_bindir}/hdspconf
@@ -169,13 +172,20 @@ done
 %{_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/
+
+# sb16_csp stuff which is excluded for PPCx
+%ifnarch ppc ppc64
+%doc %{_docdir}/%{name}-%{version}/sb16_csp
+%{_bindir}/cspctl
+%{_datadir}/man/man1/cspctl.1.gz
+%endif
+
 %endif
 
 %if 0%{!?_without_firmware:1}
@@ -195,6 +205,9 @@ done
 %endif
 
 %changelog
+* Mon May 19 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-5
+- Make it build cleanly on ppc and ppc64 by excluding sb16_csp
+
 * Sun May 18 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-4
 - Really enable firmware subpackage
 

From f4e3f46dc694be58ccbfa6d465685cd0efa3a181 Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Thu, 17 Jul 2008 07:38:07 +0000
Subject: [PATCH 22/24] Update to 1.0.16

---
 alsa-tools.spec | 7 +++++--
 sources         | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/alsa-tools.spec b/alsa-tools.spec
index a06059a..66e6f7d 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -22,8 +22,8 @@
 
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
-Version:        1.0.15
-Release:        5%{?dist}
+Version:        1.0.16
+Release:        1%{?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
@@ -205,6 +205,9 @@ done
 %endif
 
 %changelog
+* Mon Jul 14 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.16-1
+- Update to version 1.0.16
+
 * Mon May 19 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-5
 - Make it build cleanly on ppc and ppc64 by excluding sb16_csp
 
diff --git a/sources b/sources
index a1ecd62..7db2377 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
+be1974e6953b07a8c03c0627e52a3399  alsa-tools-1.0.16-pruned.tar.bz2
 57af85a810ed770885aec2a5b35648e6  echomixer.desktop
 38db1b88c44adb5591f87173061d7d98  echomixer.png
 4c10f8d250a86bdb3ea138488aec8fc4  envy24control.desktop
 3a1a195f2b9641f68651e3d312e5476f  envy24control.png
-2ab2677de89c5fd0e769b212f206101a  alsa-tools-1.0.15-pruned.tar.bz2

From 1b39e33f6e997cb8ba7fcee8477574be8de39dd2 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:26:54 +0000
Subject: [PATCH 23/24] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9d3f471..4a8e074 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := alsa-tools
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON	:= $(shell $(find-makefile-common))

From cb36a74b91c3817f5a5785f63f4a0862db4ec682 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 09:45:31 +0000
Subject: [PATCH 24/24] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4a8e074..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: alsa-tools
-# $Id$
-NAME := alsa-tools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index e9e7ccd..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-8