rpms/alsa-tools/devel echomixer.desktop, NONE, 1.1 echomixer.png, NONE, 1.1 envy24control.desktop, NONE, 1.1 envy24control.png, NONE, 1.1 .cvsignore, 1.13, 1.14 alsa-tools.spec, 1.31, 1.32 sources, 1.14, 1.15

[Tim Jackson]

Author: timj

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11886

Modified Files:
	.cvsignore alsa-tools.spec sources 
Added Files:
	echomixer.desktop echomixer.png envy24control.desktop 
	envy24control.png 
Log Message:
Update to alsa-tools 1.0.22 (#520594)



--- NEW FILE echomixer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Echomixer
GenericName=Control Echo Digital Audio sound cards
Comment=Mixer and GUI control utility for Echo Digital Audio sound cards
Exec=echomixer  
Icon=echomixer.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;
Version=0.9.4


--- NEW FILE envy24control.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Envy24 Control
GenericName=Envy24 Control Utility
Comment=Mixer and GUI control utility for Envy24-based sound cards
Exec=envy24control  
Icon=envy24control.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;
Version=0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 May 2009 17:26:10 -0000	1.13
+++ .cvsignore	10 Jan 2010 13:43:48 -0000	1.14
@@ -1 +1 @@
-alsa-tools-1.0.20-pruned.tar.bz2
+alsa-tools-1.0.22-pruned.tar.bz2


Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- alsa-tools.spec	26 Aug 2009 21:45:45 -0000	1.31
+++ alsa-tools.spec	10 Jan 2010 13:43:48 -0000	1.32
@@ -6,12 +6,12 @@
 
 %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 }
+%{?!_without_tools:     %global 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 }
+%{?!_without_tools:     %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
 %endif
 
-%{?!_without_firmware:  %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
+%{?!_without_firmware:  %global 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
@@ -22,8 +22,8 @@
 
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
-Version:        1.0.20
-Release:        4%{?dist}
+Version:        1.0.22
+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
@@ -39,7 +39,6 @@ Source2:        envy24control.png
 Source3:        echomixer.desktop
 Source4:        echomixer.png
 Source5:        90-alsa-tools-firmware.rules
-Patch0:         alsa-tools-1.0.20-glibc2.10.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel >= %{version}
 %if 0%{!?_without_tools:1}
@@ -88,7 +87,6 @@ The following tools are available:
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
 
 
 %build
@@ -219,6 +217,13 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_RO
 %endif
 
 %changelog
+* Sun Jan 10 2010 Tim Jackson <rpm at timj.co.uk> - 1.0.22-1
+- Update to 1.0.22
+- use %%global instead of %%define
+
+* Thu Sep 03 2009 Tim Jackson <rpm at timj.co.uk> - 1.0.21-1
+- Update to 1.0.21
+
 * Wed Aug 26 2009 Tim Jackson <rpm at timj.co.uk> - 1.0.20-4
 - Add missing dep on xorg-x11-fonts-misc (#503284)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 May 2009 17:39:11 -0000	1.14
+++ sources	10 Jan 2010 13:43:48 -0000	1.15
@@ -1,5 +1 @@
-57af85a810ed770885aec2a5b35648e6  echomixer.desktop
-38db1b88c44adb5591f87173061d7d98  echomixer.png
-4c10f8d250a86bdb3ea138488aec8fc4  envy24control.desktop
-3a1a195f2b9641f68651e3d312e5476f  envy24control.png
-7c0635f247cede4bc5c413f5e19fa991  alsa-tools-1.0.20-pruned.tar.bz2
+8305f7137aa5542731df8fa351554645  alsa-tools-1.0.22-pruned.tar.bz2