rpms/alsa-lib/devel alsa-lib.spec,1.35,1.36

[fedora-cvs-commits at redhat.com]

Author: stransky

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

Modified Files:
	alsa-lib.spec 
Log Message:
fix in spec file (#159046)


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- alsa-lib.spec	24 Nov 2005 14:42:19 -0000	1.35
+++ alsa-lib.spec	2 Dec 2005 12:04:59 -0000	1.36
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}%{?version_app}
-Release: 1
+Release: 2
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
@@ -65,9 +65,6 @@
 
 mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir}
 
-rm %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf
-rm %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf
-
 # install ainit binaries
 install -m 755 ainit/ainit %{buildroot}%{_bindir}
 
@@ -93,6 +90,12 @@
 
 %post
 /sbin/ldconfig 
+
+# Upgrade - remove the current buffers
+if [ $1 = 2 ] && [ -f /var/run/console/console.lock ]; then
+   /usr/bin/ainit `cat /var/run/console/console.lock` stop
+fi
+# Create the new ones
 if [ -f /var/run/console/console.lock ]; then
    /usr/bin/ainit `cat /var/run/console/console.lock` start
 fi
@@ -100,7 +103,8 @@
 %postun -p /sbin/ldconfig
 
 %preun 
-if [ -f /var/run/console/console.lock ]; then
+# Only if we're removing the package
+if [ $1 = 0 ] && [ -f /var/run/console/console.lock ]; then
    /usr/bin/ainit `cat /var/run/console/console.lock` stop
 fi
 
@@ -118,12 +122,12 @@
 %config %{_sysconfdir}/alsa/alsa.conf
 %{_bindir}/ainit
 %{_mandir}/man?/*
-#%config(noreplace) %{_sysconfdir}/alsa/pcm/dmix.conf
-#%config(noreplace) %{_sysconfdir}/alsa/pcm/dsnoop.conf
 %config %{_sysconfdir}/alsa/pcm/dmix.template
 %config %{_sysconfdir}/alsa/pcm/dsnoop.template
 %ghost  %{_sysconfdir}/alsa/pcm/dmix.conf.lock
 %ghost  %{_sysconfdir}/alsa/pcm/dsnoop.conf.lock
+%ghost  %{_sysconfdir}/alsa/pcm/dmix.conf
+%ghost  %{_sysconfdir}/alsa/pcm/dsnoop.conf
 
 %files devel
 %defattr(-, root, root)
@@ -137,6 +141,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Fri Dec 2 2005 Martin Stransky <stransky at redhat.com> 1.0.10rf-2
+- fix in spec file (#159046)
+
 * Thu Nov 24 2005 Martin Stransky <stransky at redhat.com> 1.0.10rf-1
 - new upstream version