rpms/alsa-tools/F-9 alsa-tools.spec,1.19,1.20

[Tim Jackson (timj)]

Author: timj

Update of /cvs/extras/rpms/alsa-tools/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20213

Modified Files:
	alsa-tools.spec 
Log Message:
Make it build cleanly on ppc and ppc64 by excluding sb16_csp



Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/F-9/alsa-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- alsa-tools.spec	18 May 2008 21:48:54 -0000	1.19
+++ alsa-tools.spec	19 May 2008 21:31:44 -0000	1.20
@@ -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.16
-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,16 +47,15 @@
 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 @@
 %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 @@
 %{_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 @@
 %endif
 
 %changelog
+* Mon May 19 2008 Tim Jackson <rpm at timj.co.uk> - 1.0.16-4
+- Make it build cleanly on ppc and ppc64 by excluding sb16_csp
+
 * Sun May 18 2008 Tim Jackson <rpm at timj.co.uk> - 1.0.16-3
 - Really enable firmware subpackage