rpms/GConf2/FC-6 GConf2-2.8.1-reload.patch, 1.3, 1.4 GConf2.spec, 1.49, 1.50

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Nov 6 18:17:11 UTC 2006


Author: rstrode

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

Modified Files:
	GConf2-2.8.1-reload.patch GConf2.spec 
Log Message:
- remove path name from hacky killall workaround, so that
  the work around works more reliably (bug 173869, comment 14)


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/FC-6/GConf2-2.8.1-reload.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GConf2-2.8.1-reload.patch	15 Feb 2006 15:39:45 -0000	1.3
+++ GConf2-2.8.1-reload.patch	6 Nov 2006 18:17:09 -0000	1.4
@@ -16,7 +16,7 @@
        
        gconf_engine_unref (conf);
  
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
++      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONFD, NULL, NULL, NULL, NULL);
 +
        return retval;
      }
@@ -31,7 +31,7 @@
        
        gconf_engine_unref (conf);
 +
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
++      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONFD, NULL, NULL, NULL, NULL);
  
        return retval;
      }


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/FC-6/GConf2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- GConf2.spec	29 Oct 2006 08:39:05 -0000	1.49
+++ GConf2.spec	6 Nov 2006 18:17:09 -0000	1.50
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.14.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -113,6 +113,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Nov 6 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-8
+- remove path name from hacky killall workaround, so that
+  the work around works more reliably (bug 173869, comment 14)
+
 * Sun Oct 29 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-7
 - run autoreconf, so that configure gets updated before 
   it generates libtool (so it doesn't just regenerate




More information about the fedora-cvs-commits mailing list