rpms/aumix/F-9 aumix-2.8-bug-115869.patch, 1.1, 1.2 aumix-2.8-include-signal_h.patch, 1.1, 1.2 aumix-2.8-save_load.patch, 1.1, 1.2 aumix-fix-crackrock.patch, 1.2, 1.3 aumix-fix-cursor-color-on-exit.patch, 1.1, 1.2 aumix.spec, 1.8, 1.9 curses-cleanup.patch, 1.2, 1.3

Gabriel L. Somlo somlo at fedoraproject.org
Fri Sep 26 18:10:35 UTC 2008 

Author: somlo

Update of /cvs/pkgs/rpms/aumix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4726

Modified Files:
	aumix-2.8-bug-115869.patch aumix-2.8-include-signal_h.patch 
	aumix-2.8-save_load.patch aumix-fix-crackrock.patch 
	aumix-fix-cursor-color-on-exit.patch aumix.spec 
	curses-cleanup.patch 
Log Message:
re-based patches to eliminate fuzz

aumix-2.8-bug-115869.patch:

Index: aumix-2.8-bug-115869.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-2.8-bug-115869.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-bug-115869.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-bug-115869.patch	26 Sep 2008 18:10:34 -0000	1.2
@@ -1,10 +1,9 @@
-Patch by mharris to fix bug:
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=115869
-
---- src/mute.bug-115869	Thu Dec 23 11:56:42 2004
-+++ src/mute	Thu Dec 23 11:56:55 2004
-@@ -8,7 +8,8 @@
+diff -NarU5 aumix-2.8.orig/src/mute aumix-2.8/src/mute
+--- aumix-2.8.orig/src/mute	2002-03-18 20:09:18.000000000 -0500
++++ aumix-2.8/src/mute	2008-09-26 13:52:40.000000000 -0400
+@@ -6,9 +6,10 @@
+ # Note:  it will clobber your saved settings.
+ #
  volumes=$(aumix -vq |tr -d ,)
  if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
  	$(echo $volumes | awk '{print $3}') -ne 0 ]; then

aumix-2.8-include-signal_h.patch:

Index: aumix-2.8-include-signal_h.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-2.8-include-signal_h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-include-signal_h.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-include-signal_h.patch	26 Sep 2008 18:10:34 -0000	1.2
@@ -1,6 +1,9 @@
---- src/common.h.include-signal_h	Sun May 18 01:40:04 2003
-+++ src/common.h	Sun May 18 01:38:55 2003
-@@ -37,6 +37,7 @@
+diff -NarU5 aumix-2.8.orig/src/common.h aumix-2.8/src/common.h
+--- aumix-2.8.orig/src/common.h	2002-10-29 16:27:51.000000000 -0500
++++ aumix-2.8/src/common.h	2008-09-26 13:41:59.000000000 -0400
+@@ -35,10 +35,11 @@
+ #endif				/* FALSE */
+ #include <stdio.h>
  #include <stdlib.h>		/* getenv() */
  #include <string.h>
  #include <sys/types.h>
@@ -8,3 +11,5 @@
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
+ #include <sys/ioctl.h>
+ 

aumix-2.8-save_load.patch:

Index: aumix-2.8-save_load.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-2.8-save_load.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-2.8-save_load.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-2.8-save_load.patch	26 Sep 2008 18:10:34 -0000	1.2
@@ -1,6 +1,9 @@
---- aumix-2.7/src/common.c.save_load	Mon Jun 25 22:08:22 2001
-+++ aumix-2.7/src/common.c	Mon Jun 25 22:16:30 2001
-@@ -114,6 +114,7 @@
+diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2002-10-29 16:27:51.000000000 -0500
++++ aumix-2.8/src/common.c	2008-09-26 13:39:07.000000000 -0400
+@@ -114,10 +114,11 @@
+ int             usage_ok = 1;
+ 
  int             main(int argc, char *argv[])
  {
  	int             optn, ii;
@@ -8,7 +11,11 @@
  #ifdef HAVE_CURSES
  	int             setcolors = FALSE;
  #endif				/* HAVE_CURSES */
-@@ -169,14 +170,10 @@
+ 	/* Internationalization */
+ #ifdef HAVE_NLS
+@@ -166,18 +167,14 @@
+ 				setcolors = TRUE;
+ 				interactive = IN_CURSES;
  				break;
  #endif				/* HAVE_CURSES */
  			case 'S':	/* Save to file. */
@@ -23,9 +30,13 @@
 -				ErrorExitWarn(LoadSettings(), 'e');
 +				load = 1;
  				break;
- #if defined (HAVE_CURSES) || defined (HAVE_GTK)
+ #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
  			case 'I':	/* User asked for interactive mode. */
-@@ -192,6 +189,17 @@
+ 				if (!interactive)
+ 					interactive = IN_ANY;
+@@ -189,10 +186,21 @@
+ 			default:	/* Show help. */
+ 				Usage(EXIT_FAILURE);
  			}
  		}
  	}
@@ -43,3 +54,5 @@
  #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
  /* Be interactive if no options were given. */
  	if (!interactive && argc <= 1)
+ 		interactive = IN_ANY;
+ /* By now we've decided whether to go interactive.

aumix-fix-crackrock.patch:

Index: aumix-fix-crackrock.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-fix-crackrock.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aumix-fix-crackrock.patch	15 Dec 2006 19:18:11 -0000	1.2
+++ aumix-fix-crackrock.patch	26 Sep 2008 18:10:34 -0000	1.3
@@ -1,6 +1,6 @@
 diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2006-12-15 12:47:06.000000000 -0500
-+++ aumix-2.8/src/common.c	2006-12-15 14:17:06.000000000 -0500
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:50:32.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:51:16.000000000 -0400
 @@ -17,10 +17,11 @@
   * You should have received a copy of the GNU General Public License along with
   * aumix; if not, write to the Free Software Foundation, Inc., 59 Temple Place,

aumix-fix-cursor-color-on-exit.patch:

Index: aumix-fix-cursor-color-on-exit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix-fix-cursor-color-on-exit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix-fix-cursor-color-on-exit.patch	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix-fix-cursor-color-on-exit.patch	26 Sep 2008 18:10:34 -0000	1.2
@@ -1,11 +1,9 @@
-michael at yohe.net - this fixes the blue cursor that appears on some terminals
-as - CloseScreen() resets the color to default, but nothing ever gets printed
-so the cursor was never updated.  Simply adding a carriage return does not
-change the behavior, and will reset the cursor properly.
-
---- src/common.c	2002-11-25 10:07:08.000000000 -0600
-+++ src/common.c	2002-11-25 10:06:50.000000000 -0600
-@@ -251,6 +251,9 @@
+diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:45:15.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:49:45.000000000 -0400
+@@ -256,10 +256,13 @@
+ 		Gpm_Close();
+ #endif				/* HAVE_CURSES */
  		close(mixer_fd);
  #if HAVE_CURSES
  		CloseScreen();
@@ -15,3 +13,5 @@
  	}
  #endif				/* HAVE_CURSES */
  	exit(EXIT_SUCCESS);
+ }
+ 


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/aumix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aumix.spec	20 Feb 2008 00:39:59 -0000	1.8
+++ aumix.spec	26 Sep 2008 18:10:35 -0000	1.9
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -21,10 +21,10 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
 
 %build
@@ -50,6 +50,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Fri Sep 26 2008 Gabriel L. Somlo <somlo at cmu.edu> 2.8-18
+- re-based patches to eliminate fuzz
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.8-17
 - Autorebuild for GCC 4.3
 

curses-cleanup.patch:

Index: curses-cleanup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-9/curses-cleanup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- curses-cleanup.patch	29 Mar 2007 01:49:39 -0000	1.2
+++ curses-cleanup.patch	26 Sep 2008 18:10:35 -0000	1.3
@@ -1,6 +1,6 @@
 diff -NarU5 aumix-2.8.orig/config.h.in aumix-2.8/config.h.in
 --- aumix-2.8.orig/config.h.in	2002-11-24 20:35:41.000000000 -0500
-+++ aumix-2.8/config.h.in	2007-03-21 14:34:23.000000000 -0400
++++ aumix-2.8/config.h.in	2008-09-26 13:53:42.000000000 -0400
 @@ -160,13 +160,10 @@
  #undef HAVE_SYS_TIME_H
  
@@ -42,7 +42,7 @@
  
 diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
 --- aumix-2.8.orig/configure	2002-11-24 20:35:48.000000000 -0500
-+++ aumix-2.8/configure	2007-03-21 14:39:52.000000000 -0400
++++ aumix-2.8/configure	2008-09-26 13:53:42.000000000 -0400
 @@ -1,71 +1,344 @@
  #! /bin/sh
 -
@@ -10364,7 +10364,7 @@
  
 diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
 --- aumix-2.8.orig/configure.in	2002-11-24 20:04:16.000000000 -0500
-+++ aumix-2.8/configure.in	2007-03-21 14:52:37.000000000 -0400
++++ aumix-2.8/configure.in	2008-09-26 13:53:42.000000000 -0400
 @@ -72,39 +72,10 @@
        AC_DEFINE(HAVE_USEKEYPAD, 1,
  	[Define this if your ncurses library has the member _use_keypad
@@ -10486,7 +10486,7 @@
  AC_MSG_RESULT($dummy_mixer)
 diff -NarU5 aumix-2.8.orig/data/Makefile.in aumix-2.8/data/Makefile.in
 --- aumix-2.8.orig/data/Makefile.in	2002-11-24 20:35:44.000000000 -0500
-+++ aumix-2.8/data/Makefile.in	2007-03-21 14:43:17.000000000 -0400
++++ aumix-2.8/data/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10502,7 +10502,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/doc/Makefile.in aumix-2.8/doc/Makefile.in
 --- aumix-2.8.orig/doc/Makefile.in	2002-11-24 20:35:44.000000000 -0500
-+++ aumix-2.8/doc/Makefile.in	2007-03-21 14:43:25.000000000 -0400
++++ aumix-2.8/doc/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10518,7 +10518,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/Makefile.in aumix-2.8/Makefile.in
 --- aumix-2.8.orig/Makefile.in	2002-11-24 20:35:46.000000000 -0500
-+++ aumix-2.8/Makefile.in	2007-03-21 14:42:55.000000000 -0400
++++ aumix-2.8/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -60,12 +60,10 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -10534,7 +10534,7 @@
  GTK_LIBS = @GTK_LIBS@
 diff -NarU5 aumix-2.8.orig/po/POTFILES.in aumix-2.8/po/POTFILES.in
 --- aumix-2.8.orig/po/POTFILES.in	2000-06-27 01:51:42.000000000 -0400
-+++ aumix-2.8/po/POTFILES.in	2007-03-21 14:26:03.000000000 -0400
++++ aumix-2.8/po/POTFILES.in	2008-09-26 13:53:42.000000000 -0400
 @@ -2,6 +2,6 @@
  
  # Package source files
@@ -10544,8 +10544,8 @@
 -src/gtk.c
 +#src/gtk.c
 diff -NarU5 aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2007-03-20 16:22:56.000000000 -0400
-+++ aumix-2.8/src/common.c	2007-03-28 21:32:56.000000000 -0400
+--- aumix-2.8.orig/src/common.c	2008-09-26 13:51:46.000000000 -0400
++++ aumix-2.8/src/common.c	2008-09-26 13:53:42.000000000 -0400
 @@ -21,15 +21,11 @@
  
  #include <errno.h>
@@ -10725,8 +10725,8 @@
    S:  save settings\n"));
  	exit(status);
 diff -NarU5 aumix-2.8.orig/src/common.h aumix-2.8/src/common.h
---- aumix-2.8.orig/src/common.h	2007-03-20 16:22:18.000000000 -0400
-+++ aumix-2.8/src/common.h	2007-03-20 16:26:05.000000000 -0400
+--- aumix-2.8.orig/src/common.h	2008-09-26 13:48:53.000000000 -0400
++++ aumix-2.8/src/common.h	2008-09-26 13:53:42.000000000 -0400
 @@ -20,15 +20,14 @@
  #ifndef AUMIX_H
  #define AUMIX_H
@@ -10747,7 +10747,7 @@
  #define FALSE 0
 diff -NarU5 aumix-2.8.orig/src/curses.c aumix-2.8/src/curses.c
 --- aumix-2.8.orig/src/curses.c	2002-10-23 11:07:40.000000000 -0400
-+++ aumix-2.8/src/curses.c	2007-03-28 21:13:19.000000000 -0400
++++ aumix-2.8/src/curses.c	2008-09-26 13:53:42.000000000 -0400
 @@ -150,14 +150,10 @@
  	PlaceCursor();
  }
@@ -10944,7 +10944,7 @@
  void            DrawLevelBalModeCurses(int dev, int mode)
 diff -NarU5 aumix-2.8.orig/src/curses.h aumix-2.8/src/curses.h
 --- aumix-2.8.orig/src/curses.h	2002-05-06 02:23:29.000000000 -0400
-+++ aumix-2.8/src/curses.h	2007-03-28 18:04:51.000000000 -0400
++++ aumix-2.8/src/curses.h	2008-09-26 13:53:42.000000000 -0400
 @@ -18,11 +18,10 @@
   */
  
@@ -11895,7 +11895,7 @@
 -#endif				/* AUMIX_GTK_H */
 diff -NarU5 aumix-2.8.orig/src/interactive.c aumix-2.8/src/interactive.c
 --- aumix-2.8.orig/src/interactive.c	2002-10-29 16:27:52.000000000 -0500
-+++ aumix-2.8/src/interactive.c	2007-03-22 13:52:57.000000000 -0400
++++ aumix-2.8/src/interactive.c	2008-09-26 13:53:42.000000000 -0400
 @@ -17,56 +17,13 @@
   * aumix; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
   * Suite 330, Boston, MA 02111-1307, USA.
@@ -12060,7 +12060,7 @@
 +#endif				/* HAVE_CURSES */
 diff -NarU5 aumix-2.8.orig/src/interactive.h aumix-2.8/src/interactive.h
 --- aumix-2.8.orig/src/interactive.h	2000-04-12 11:02:04.000000000 -0400
-+++ aumix-2.8/src/interactive.h	2007-03-22 13:53:07.000000000 -0400
++++ aumix-2.8/src/interactive.h	2008-09-26 13:53:42.000000000 -0400
 @@ -2,16 +2,12 @@
  #define INTERACTIVE_H
  #define MUTE_NO_DEVICE -1
@@ -12089,7 +12089,7 @@
  #endif				/* INTERACTIVE_H */
 diff -NarU5 aumix-2.8.orig/src/Makefile.am aumix-2.8/src/Makefile.am
 --- aumix-2.8.orig/src/Makefile.am	2002-03-18 20:09:17.000000000 -0500
-+++ aumix-2.8/src/Makefile.am	2007-03-21 14:42:44.000000000 -0400
++++ aumix-2.8/src/Makefile.am	2008-09-26 13:53:42.000000000 -0400
 @@ -1,17 +1,17 @@
  # $Aumix: aumix/src/Makefile.am,v 1.2 2002/03/19 01:09:17 trevor Exp $
  bin_PROGRAMS	= aumix
@@ -12114,7 +12114,7 @@
  	$(COMPILE) -DDATADIR=\"$(datadir)/aumix\" -c $<
 diff -NarU5 aumix-2.8.orig/src/Makefile.in aumix-2.8/src/Makefile.in
 --- aumix-2.8.orig/src/Makefile.in	2002-11-24 20:35:45.000000000 -0500
-+++ aumix-2.8/src/Makefile.in	2007-03-21 14:42:38.000000000 -0400
++++ aumix-2.8/src/Makefile.in	2008-09-26 13:53:42.000000000 -0400
 @@ -62,17 +62,12 @@
  AWK = @AWK@
  CATALOGS = @CATALOGS@
@@ -12166,7 +12166,7 @@
  SCRIPTS =  $(bin_SCRIPTS)
 diff -NarU5 aumix-2.8.orig/src/mouse.c aumix-2.8/src/mouse.c
 --- aumix-2.8.orig/src/mouse.c	2002-05-07 04:41:38.000000000 -0400
-+++ aumix-2.8/src/mouse.c	2007-03-22 13:52:43.000000000 -0400
++++ aumix-2.8/src/mouse.c	2008-09-26 13:53:42.000000000 -0400
 @@ -17,155 +17,32 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -12327,7 +12327,7 @@
  		case 7:	/* only */
 diff -NarU5 aumix-2.8.orig/src/mouse.h aumix-2.8/src/mouse.h
 --- aumix-2.8.orig/src/mouse.h	2002-03-28 04:37:27.000000000 -0500
-+++ aumix-2.8/src/mouse.h	2007-03-20 16:26:05.000000000 -0400
++++ aumix-2.8/src/mouse.h	2008-09-26 13:53:42.000000000 -0400
 @@ -17,30 +17,17 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */

More information about the fedora-extras-commits mailing list