packages: sndconfig/sndconfig.spec, sndconfig/sndconfig-PLD_and_rename_conf...

[draenog]

Author: draenog                      Date: Fri Nov 11 19:14:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- decompress patch

---- Files affected:
packages/sndconfig:
   sndconfig.spec (1.23 -> 1.24) , sndconfig-PLD_and_rename_conf.modules.patch (NONE -> 1.1)  (NEW), sndconfig-PLD_and_rename_conf.modules.patch.bz2 (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/sndconfig/sndconfig.spec
diff -u packages/sndconfig/sndconfig.spec:1.23 packages/sndconfig/sndconfig.spec:1.24
--- packages/sndconfig/sndconfig.spec:1.23	Sat Jan 29 01:07:23 2011
+++ packages/sndconfig/sndconfig.spec	Fri Nov 11 20:14:08 2011
@@ -8,7 +8,7 @@
 Group:		Applications/Sound
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	99735d5aeb239619a47353b6a92b34ef
-Patch0:		%{name}-PLD_and_rename_conf.modules.patch.bz2
+Patch0:		%{name}-PLD_and_rename_conf.modules.patch
 Patch1:		%{name}-isapnp.patch
 Patch2:		%{name}-awe_wave.patch
 Patch3:		%{name}-gcc.patch
@@ -82,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2011/11/11 19:14:08  draenog
+- decompress patch
+
 Revision 1.23  2011/01/29 00:07:23  sparky
 - dropped pre-cvs changelog
 

================================================================
Index: packages/sndconfig/sndconfig-PLD_and_rename_conf.modules.patch
diff -u /dev/null packages/sndconfig/sndconfig-PLD_and_rename_conf.modules.patch:1.1
--- /dev/null	Fri Nov 11 20:14:13 2011
+++ packages/sndconfig/sndconfig-PLD_and_rename_conf.modules.patch	Fri Nov 11 20:14:08 2011
@@ -0,0 +1,78 @@
+diff -urN sndconfig.orig/sndconfig.c sndconfig/sndconfig.c
+--- sndconfig.orig/sndconfig.c	Mon Apr 19 15:29:04 1999
++++ sndconfig/sndconfig.c	Sun Feb  3 20:20:09 2002
+@@ -299,7 +299,8 @@
+ /* get newt initialized, set help line, etc */
+ static void NewtStartUp( void ) {
+     char roottext[80];
+-
++    char roottext2[80];
++    
+     newtInit();
+     newtCls();
+     newtPushHelpLine(_("  <Tab>/<Alt-Tab> between elements  |"
+@@ -308,7 +309,12 @@
+     snprintf(roottext, 80,
+ 	     _("Sound Configuration Utility %s          "
+              "         (C) 1999 Red Hat Software"), VERSION);
++    snprintf(roottext2, 80,
++	     _("                                        "
++	     "           (C) 2002 PLD Linux port "), VERSION);
++    
+     newtDrawRootText(0, 0, roottext);
++    newtDrawRootText(0, 1, roottext2);
+ }
+ 
+ static char *CardTypeToString( enum cards type ) {
+@@ -454,12 +460,12 @@
+     set->descr[0]=0;
+     fclose(f);
+     
+-    /* If card is unspecified, don't even bother looking in /etc/conf.modules */
++    /* If card is unspecified, don't even bother looking in /etc/modules.conf */
+     if (set->type == UNSPEC)
+       return 0;
+ 
+-    /* now read io settings from /etc/conf.modules */
+-    if ((f=fopen("/etc/conf.modules","r"))==NULL)
++    /* now read io settings from /etc/modules.conf */
++    if ((f=fopen("/etc/modules.conf","r"))==NULL)
+ 	return -1;
+     
+     /* scan for line for modulenames */
+@@ -973,7 +979,7 @@
+ 	return -1;
+ 
+     snprintf(modulename,200," %s ",set->modulename);
+-    if ((f=fopen("/etc/conf.modules", "r"))!=NULL) {
++    if ((f=fopen("/etc/modules.conf", "r"))!=NULL) {
+ 	    while(1) {
+ 		    if (!fgets(tmpstr, sizeof(tmpstr), f))
+ 		      break;
+@@ -994,13 +1000,13 @@
+ 	    fclose(f);
+     }
+ 
+-    if (!madebackup && !access("/etc/conf.modules", F_OK)) {
++    if (!madebackup && !access("/etc/modules.conf", F_OK)) {
+ 	newtWinMessage(_("File Exists"), _("Ok"),
+-		       _("There is already a file called /etc/conf.modules."
++		       _("There is already a file called /etc/modules.conf."
+ 		       " The existing file will be renamed "
+-		       "/etc/conf.modules.bak and a new file will be "
++		       "/etc/modules.conf.bak and a new file will be "
+ 		       "written."));
+-	rename("/etc/conf.modules", "/etc/conf.modules.bak");
++	rename("/etc/modules.conf", "/etc/modules.conf.bak");
+ 	madebackup=1;
+     }
+     
+@@ -1133,7 +1139,7 @@
+ 
+     fclose(t);
+     chmod(tmpfile,0644);
+-    rename(tmpfile,"/etc/conf.modules");
++    rename(tmpfile,"/etc/modules.conf");
+     return 0;
+ }
+  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sndconfig/sndconfig.spec?r1=1.23&r2=1.24&f=u