rpms/nas/FC-6 nas.spec,1.12,1.13 nasd_247468.patch,1.1,1.2

[Frank Büttner (frankb)]

Author: frankb

Update of /cvs/extras/rpms/nas/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15418

Modified Files:
	nas.spec nasd_247468.patch 
Log Message:
add better patch for #247468



Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/FC-6/nas.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nas.spec	2 Nov 2007 16:26:38 -0000	1.12
+++ nas.spec	2 Nov 2007 17:26:49 -0000	1.13
@@ -1,7 +1,7 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.9a
-Release:	2%{?dist}
+Release:	3%{?dist}
 BuildRequires:	bison flex
 %if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
@@ -117,6 +117,9 @@
 
 
 %changelog 
+*Fri Nov 02 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9a-3
+ - add better patch for #247468 
+
 *Fri Nov 02 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9a-2
  - add patch to fix #247468
 

nasd_247468.patch:

Index: nasd_247468.patch
===================================================================
RCS file: /cvs/extras/rpms/nas/FC-6/nasd_247468.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nasd_247468.patch	2 Nov 2007 16:26:38 -0000	1.1
+++ nasd_247468.patch	2 Nov 2007 17:26:49 -0000	1.2
@@ -1,15 +1,12 @@
-diff -up nas-1.9/server/dda/voxware/auvoxware.c.leave-the-mixer-alone-it's-not-your-job nas-1.9/server/dda/voxware/auvoxware.c
---- nas-1.9/server/dda/voxware/auvoxware.c.leave-the-mixer-alone-it's-not-your-job	2007-11-02 11:27:04.000000000 -0400
-+++ nas-1.9/server/dda/voxware/auvoxware.c	2007-11-02 11:27:56.000000000 -0400
-@@ -467,8 +467,9 @@ mixerInputModeToNAS(int input_mode)
- static void
- setMixerDefaults(void)
- {
--    setPhysicalOutputGain(auDefaultOutputGain);
--    setPhysicalInputGainAndLineMode(auDefaultInputGain, AuDeviceLineModeLow);
-+    /* Do not mess with the mixer defaults. */
-+    /* setPhysicalOutputGain(auDefaultOutputGain); */
-+    /* setPhysicalInputGainAndLineMode(auDefaultInputGain, AuDeviceLineModeLow); */
- }
+diff -Naur nas-1.9a.org/server/nasd.conf.eg nas-1.9a/server/nasd.conf.eg
+--- nas-1.9a.org/server/nasd.conf.eg	2007-06-16 21:03:22.000000000 +0200
++++ nas-1.9a/server/nasd.conf.eg	2007-11-02 17:55:45.000000000 +0100
+@@ -27,7 +27,7 @@
  
- static int
+ # init the mixer on startup? Voxware only.
+ # defaults to "yes"
+-MixerInit	"yes"			
++MixerInit	"no"			
+ 
+ # Initialize the mixer settings on every audio device open?
+ # Settings are only initialized if MixerInit is set to "yes".