rpms/xchat-gnome/devel xchat-gnome-screensaver.patch, NONE, 1.1 xchat-gnome.spec, 1.18, 1.19

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27341

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-screensaver.patch 
Log Message:
* Fri Feb 24 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
- Add patch to use correct gnome-screensaver dbus object.
- Drop killall gconfd-2 calls in scriptlets.


xchat-gnome-screensaver.patch:

--- NEW FILE xchat-gnome-screensaver.patch ---
diff -ur xchat-gnome-0.10.OLD/plugins/autoaway/gscreensaver.c xchat-gnome-0.10/plugins/autoaway/gscreensaver.c
--- xchat-gnome-0.10.OLD/plugins/autoaway/gscreensaver.c	2006-02-12 06:06:27.000000000 -0500
+++ xchat-gnome-0.10/plugins/autoaway/gscreensaver.c	2006-02-24 13:01:14.000000000 -0500
@@ -71,9 +71,9 @@
 		return;
 	}
 	dbus_proxy = dbus_g_proxy_new_for_name (connection,
-						"org.gnome.screensaver",
-						"/org/gnome/screensaver",
-						"org.gnome.screensaver");
+						"org.gnome.ScreenSaver",
+						"/org/gnome/ScreenSaver",
+						"org.gnome.ScreenSaver");
 	if (!dbus_proxy) {
 		g_printerr ("Couldn't create a dbus proxy to gnome-screensaver\n");
 		return;


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xchat-gnome.spec	24 Feb 2006 16:26:32 -0000	1.18
+++ xchat-gnome.spec	24 Feb 2006 19:05:17 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           xchat-gnome
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-config.patch
+Patch1:		%{name}-screensaver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -52,6 +53,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p1 -b .screensaver
 
 
 %build
@@ -86,7 +88,6 @@
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
 	done
-	killall -HUP gconfd-2 || :
 fi
 
 
@@ -97,7 +98,6 @@
 	gconftool-2 --makefile-install-rule \
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
 done
-killall -HUP gconfd-2 || :
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 
 
@@ -109,7 +109,6 @@
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
 	done
-	killall -HUP gconfd-2 || :
 fi
 
 
@@ -136,6 +135,10 @@
 
 
 %changelog
+* Fri Feb 24 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-2
+- Add patch to use correct gnome-screensaver dbus object.
+- Drop killall gconfd-2 calls in scriptlets.
+
 * Fri Feb 24 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-1
 - Update to 0.10.
 - Add -disable-scrollkeeprer to config.