rpms/alsa-utils/devel .cvsignore, 1.9, 1.10 alsa-utils.spec, 1.16, 1.17 sources, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18787

Modified Files:
	.cvsignore alsa-utils.spec sources 
Log Message:
New upstream version/moved alsacard utility from alsa-lib to alsa-tools


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	25 Apr 2005 10:39:04 -0000	1.9
+++ .cvsignore	30 May 2005 15:41:45 -0000	1.10
@@ -1,3 +1,5 @@
 alsa-utils-1.0.7.tar.bz2
 alsa-utils-1.0.8.tar.bz2
 alsa-utils-1.0.9rc2.tar.bz2
+alsa-utils-1.0.9.tar.bz2
+alsacard.c


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- alsa-utils.spec	16 May 2005 20:44:56 -0000	1.16
+++ alsa-utils.spec	30 May 2005 15:41:45 -0000	1.17
@@ -1,13 +1,16 @@
+%define         version_main 1.0.9
+%define         version_app  rf
+
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
-Version: 	1.0.9rc2
-Release:	2
+Version: 	%{version_main}%{?version_app}
+Release:	1
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
-Source: 	ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
+Source: 	ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version_main}%{?prever}.tar.bz2
 Source2:	salsa.c
-Patch0:	        alsa-utils-1.0.9rc2-make.patch
+Source3: 	alsacard.c
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
@@ -19,14 +22,14 @@
 Architecture (ALSA).
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
-%patch0 -p1 -b .man
+%setup -q -n %{name}-%{version_main}%{?prever}
 
 %build
 autoreconf -f -i
 %configure CFLAGS="$RPM_OPT_FLAGS" --sbindir=/sbin 
 %{__make} %{?_smp_mflags}
 %{__cc} $RPM_OPT_FLAGS -o salsa %{SOURCE2} -lasound
+%{__cc} $RPM_OPT_FLAGS -o alsacard %{SOURCE3} -lasound
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -40,6 +43,7 @@
 
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/dev.d/sound
 install -m 755 salsa $RPM_BUILD_ROOT/etc/dev.d/sound/alsa.dev
+install -m 755 alsacard  %{buildroot}%{_bindir}
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -54,9 +58,16 @@
 /sbin/*
 %{_mandir}/man?/*
 %{_mandir}/fr/man?/*
+/usr/share/sounds/alsa/*
+/usr/share/alsa/speaker-test/*
+%{_bindir}/alsacard
 
 
 %changelog
+* Mon May 30 2005 Martin Stransky <stransky at redhat.com> 1.0.9-1
+- New upstream version.
+- moved alsacard utility from alsa-lib to alsa-tools
+
 * Mon May 16 2005 Bill Nottingham <notting at redhat.com> 1.0.9rc2-2
 - make sure 'Wave' playback channel isn't muted (#157850)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Apr 2005 10:39:04 -0000	1.10
+++ sources	30 May 2005 15:41:45 -0000	1.11
@@ -1 +1,2 @@
-1827c3b40be142f93a78f280c24436cf  alsa-utils-1.0.9rc2.tar.bz2
+c7037c54ed06d32577947f632f2c677b  alsa-utils-1.0.9.tar.bz2
+84a139aff67d14024a3f3e4e9c586367  alsacard.c