rpms/GConf2/devel GConf2-2.8.1-reload.patch, 1.1, 1.2 GConf2.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: caillon

Update of /cvs/dist/rpms/GConf2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31550

Modified Files:
	GConf2-2.8.1-reload.patch GConf2.spec 
Log Message:
* Thu Feb  2 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-3
- Use the correct patch ;-)


GConf2-2.8.1-reload.patch:
 gconftool.c |    4 ++++
 1 files changed, 4 insertions(+)

Index: GConf2-2.8.1-reload.patch
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2-2.8.1-reload.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GConf2-2.8.1-reload.patch	2 Feb 2006 03:05:26 -0000	1.1
+++ GConf2-2.8.1-reload.patch	2 Feb 2006 17:39:51 -0000	1.2
@@ -1,6 +1,18 @@
---- GConf-2.8.1/gconf/gconftool.c.reload	2005-01-07 15:08:10.552350838 +0100
-+++ GConf-2.8.1/gconf/gconftool.c	2005-01-07 15:12:04.869990535 +0100
-@@ -896,6 +896,8 @@
+Index: gconf/gconf/gconftool.c
+===================================================================
+RCS file: /cvs/gnome/gconf/gconf/gconftool.c,v
+retrieving revision 1.102
+diff -d -u -p -U10 -r1.102 gconftool.c
+--- gconf/gconf/gconftool.c	3 Jan 2006 17:05:28 -0000	1.102
++++ gconf/gconf/gconftool.c	1 Feb 2006 18:34:36 -0000
+@@ -881,32 +881,36 @@ main (int argc, char** argv)
+   if (makefile_install_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval;
+ 
+       umask (022);
+       retval = do_makefile_install (conf, args, FALSE);
        
        gconf_engine_unref (conf);
  
@@ -9,12 +21,24 @@
        return retval;
      }
  
-@@ -909,6 +911,8 @@
+   if (makefile_uninstall_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval;
+ 
+       umask (022);
+       retval = do_makefile_install (conf, args, TRUE);
        
        gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -HUP " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
 +
++      g_spawn_command_line_sync ("/usr/bin/killall -q -HUP " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
+ 
        return retval;
      }
  
+   if (break_key_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval = do_break_key(conf, args);
+ 
+       gconf_engine_unref(conf);


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- GConf2.spec	2 Feb 2006 03:05:26 -0000	1.33
+++ GConf2.spec	2 Feb 2006 17:39:51 -0000	1.34
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.13.5
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Feb  2 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-3
+- Use the correct patch ;-)
+
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-2
 - Add patch from Mandriva to reload GConf2 every time a schema is
   added or removed (solves bug 173869)