rpms/esound/devel esound-nospawn.patch, NONE, 1.1 esound.spec, 1.50, 1.51

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/esound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24652

Modified Files:
	esound.spec 
Added Files:
	esound-nospawn.patch 
Log Message:
Remove /etc/esd.conf


esound-nospawn.patch:

--- NEW FILE esound-nospawn.patch ---
diff -up esound-0.2.41/esd_config.c.nospawn esound-0.2.41/esd_config.c
--- esound-0.2.41/esd_config.c.nospawn	2009-03-31 23:57:35.860368388 -0400
+++ esound-0.2.41/esd_config.c	2009-03-31 23:57:51.032658859 -0400
@@ -6,7 +6,7 @@
 #include <ctype.h>
 #include <string.h>
 
-int esd_no_spawn=0; /* If we can't even find the system config file,
+int esd_no_spawn=1; /* If we can't even find the system config file,
 		       things are screwed up - don't try to make things
 		       worse. */
 int esd_spawn_wait_ms=100; /* Time to wait trying to connect to an


Index: esound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esound/devel/esound.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- esound.spec	16 Mar 2009 03:28:36 -0000	1.50
+++ esound.spec	1 Apr 2009 04:02:51 -0000	1.51
@@ -2,16 +2,18 @@
 Summary: Allows several audio streams to play on a single audio device
 Name:    esound
 Version: 0.2.41
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 License: LGPLv2+
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
 Group: System Environment/Daemons
 Source0:  http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch4: esound-0.2.38-drain.patch
 Patch6: esound-0.2.38-fix-open-macro.patch
 Patch7: remove-confusing-spew.patch
+# default to nospawn, so we can kill the esd.conf file
+Patch8: esound-nospawn.patch
 # temporarily disable doc build due to xml catalog issues
 #BuildRequires: docbook-utils
 BuildRequires: audiofile-devel
@@ -65,6 +67,7 @@
 %patch4 -p1 -b .drain-race
 %patch6 -p1 -b .open-macro
 %patch7 -p1 -b .spew
+%patch8 -p1 -b .nospawn
 
 %build
 %configure --disable-static
@@ -75,6 +78,7 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/esd.conf
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # Delete the esound binary
 rm -f $RPM_BUILD_ROOT%{_bindir}/esd $RPM_BUILD_ROOT%{_mandir}/man1/esd.1*
@@ -90,7 +94,6 @@
 %doc AUTHORS COPYING.LIB ChangeLog docs/esound.sgml
 %doc NEWS README TIPS TODO
 %defattr(-, root, root,-)
-%config(noreplace) /etc/*
 %{_libdir}/*.so.*
 
 %files tools
@@ -125,6 +128,9 @@
 %{_mandir}/man1/esd-config.1.gz
 
 %changelog
+* Tue Mar 31 2009 Matthias Clasen <mclasen at redhat.com> - 1:0.2.41-2
+- Remove /etc/esd.conf (#491481)
+
 * Sun Mar 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:0.2.41-1
 - Update to 0.2.41