rpms/gnome-libs/devel RH-gnome-libs-rhsnddefs.patch, 1.1, 1.2 gnome-libs-1.4.2-prototypes.patch, 1.1, 1.2 gnome-libs.spec, 1.10, 1.11

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18835

Modified Files:
	RH-gnome-libs-rhsnddefs.patch 
	gnome-libs-1.4.2-prototypes.patch gnome-libs.spec 
Log Message:
* Fri Aug 29 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-10
- Use %patch0 rather than %patch in %prep
- Fix patches to work without fuzz


RH-gnome-libs-rhsnddefs.patch:

Index: RH-gnome-libs-rhsnddefs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/RH-gnome-libs-rhsnddefs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RH-gnome-libs-rhsnddefs.patch	14 Sep 2006 06:23:10 -0000	1.1
+++ RH-gnome-libs-rhsnddefs.patch	30 Aug 2008 08:06:15 -0000	1.2
@@ -1,20 +1,20 @@
---- gnome-libs-1.0.10/gnome-data/gnome.soundlist.rhsnddefs	Mon May 31 07:04:03 1999
-+++ gnome-libs-1.0.10/gnome-data/gnome.soundlist	Mon Jun  7 11:57:18 1999
-@@ -8,7 +8,7 @@
- description[it]=Eventi di sistema GNOME
+--- gnome-libs-1.4.2/gnome-data/gnome.soundlist.rhsnddefs	2001-08-27 01:18:49.000000000 +0100
++++ gnome-libs-1.4.2/gnome-data/gnome.soundlist			2008-08-30 08:41:21.000000000 +0100
+@@ -22,7 +22,7 @@
+ description[zh_TW]=GNOME ¨t²Î¨Æ¥ó
  
  [login]
 -file=login.wav
 +file=
  description=Login
  description[ca]=Entrada al sistema
- description[es]=Apertura de sesión
-@@ -18,7 +18,7 @@
- description[it]=Login
+ description[da]=Indlogning
+@@ -46,7 +46,7 @@
+ description[zh_TW]=µn¤J
  
  [logout]
 -file=logout.wav
 +file=
  description=Logout
  description[ca]=Eixida del sistema
- description[es]=Salida de sesión
+ description[da]=Udlogning

gnome-libs-1.4.2-prototypes.patch:

Index: gnome-libs-1.4.2-prototypes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs-1.4.2-prototypes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-libs-1.4.2-prototypes.patch	14 Sep 2006 06:23:10 -0000	1.1
+++ gnome-libs-1.4.2-prototypes.patch	30 Aug 2008 08:06:16 -0000	1.2
@@ -1,5 +1,5 @@
---- gnome-libs-1.2.13/support/poptint.h.prototypes	Mon Aug 27 17:38:20 2001
-+++ gnome-libs-1.2.13/support/poptint.h	Mon Aug 27 17:37:09 2001
+--- gnome-libs-1.4.2/support/poptint.h.prototypes	2000-02-26 07:30:08.000000000 +0000
++++ gnome-libs-1.4.2/support/poptint.h	2008-08-30 08:49:08.000000000 +0100
 @@ -45,7 +45,7 @@
  
  #define	xfree(_a)	free((void *)_a)
@@ -9,8 +9,8 @@
  #include <libintl.h>
  #endif
  
---- gnome-libs-1.2.13/libgnomeui/gnome-dock-layout.c.prototypes	Mon Dec 18 18:09:51 2000
-+++ gnome-libs-1.2.13/libgnomeui/gnome-dock-layout.c	Mon Aug 27 17:44:53 2001
+--- gnome-libs-1.4.2/libgnomeui/gnome-dock-layout.c.prototypes	2002-01-06 21:30:17.000000000 +0000
++++ gnome-libs-1.4.2/libgnomeui/gnome-dock-layout.c	2008-08-30 08:49:08.000000000 +0100
 @@ -20,6 +20,8 @@
     Author: Ettore Perazzoli <ettore at comm2000.it>
  */
@@ -19,9 +19,9 @@
 +
  #include <gtk/gtk.h>
  #include <stdio.h>
- 
---- gnome-libs-1.2.13/libgnomeui/gnome-window.c.prototypes	Mon Aug 27 17:45:21 2001
-+++ gnome-libs-1.2.13/libgnomeui/gnome-window.c	Mon Aug 27 17:45:33 2001
+ #include <string.h>
+--- gnome-libs-1.4.2/libgnomeui/gnome-window.c.prototypes	2001-06-14 16:09:43.000000000 +0100
++++ gnome-libs-1.4.2/libgnomeui/gnome-window.c	2008-08-30 08:49:08.000000000 +0100
 @@ -22,6 +22,8 @@
   */
  
@@ -29,10 +29,10 @@
 +#include <string.h>
 +
  #include <config.h>
+ #include <string.h>
  #include <glib.h>
- #include <gtk/gtkwindow.h>
---- gnome-libs-1.2.13/libgnomeui/gnome_segv.c.prototypes	Mon Aug 27 17:46:08 2001
-+++ gnome-libs-1.2.13/libgnomeui/gnome_segv.c	Mon Aug 27 17:47:39 2001
+--- gnome-libs-1.4.2/libgnomeui/gnome_segv.c.prototypes	2002-04-24 15:04:17.000000000 +0100
++++ gnome-libs-1.4.2/libgnomeui/gnome_segv.c	2008-08-30 08:49:08.000000000 +0100
 @@ -6,6 +6,10 @@
  #ifndef _POSIX_SOURCE
  #  define _POSIX_SOURCE 1


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-libs.spec	28 May 2008 12:54:44 -0000	1.10
+++ gnome-libs.spec	30 Aug 2008 08:06:16 -0000	1.11
@@ -5,7 +5,7 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        The main GNOME1 libraries
 License:        LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
 Group:          System Environment/Libraries
@@ -111,7 +111,7 @@
 
 %prep
 %setup -q -a 3
-%patch  -p1
+%patch0 -p1
 %patch5 -p1
 %patch9 -p1 -b .quote
 %patch25 -p0 -b .iconedit
@@ -301,6 +301,10 @@
 %{_libdir}/libgnomeui.so
 
 %changelog
+* Fri Aug 29 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-10
+- Use %%patch0 rather than %%patch in %%prep
+- Fix patches to work without fuzz
+
 * Wed May 28 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-9
 - Break recursive gnome-config <-> pkg-config loop if 64-bit glib-devel
   package is not installed on a 64-bit system (#445981)