rpms/xchat-gnome/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xchat-gnome-config.patch, 1.2, 1.3 xchat-gnome-libnotify.patch, 1.1, 1.2 xchat-gnome.spec, 1.22, 1.23 xchat-gnome-screensaver.patch, 1.1, NONE

Mon Jun 19 17:38:44 UTC 2006

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18424

Modified Files:
	.cvsignore sources xchat-gnome-config.patch 
	xchat-gnome-libnotify.patch xchat-gnome.spec 
Removed Files:
	xchat-gnome-screensaver.patch 
Log Message:
* Tue Apr  4 2006 Brian Pepple <bdpepple at ameritech.net> - 0.11-1
- Update to 0.11
- Drop screensaver patch.
- Add scriptlet for gtk+ icon cache.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	24 Feb 2006 16:26:32 -0000	1.8
+++ .cvsignore	5 Apr 2006 04:40:06 -0000	1.9
@@ -1 +1 @@
-xchat-gnome-0.10.tar.bz2
+xchat-gnome-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Feb 2006 16:26:32 -0000	1.8
+++ sources	5 Apr 2006 04:40:06 -0000	1.9
@@ -1 +1 @@
-1ff2b7adfc71592951ee843599a8c8f7  xchat-gnome-0.10.tar.bz2
+257d0b0a758898960be42856ab0e31ef  xchat-gnome-0.11.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/xchat-gnome-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xchat-gnome-config.patch	24 Feb 2006 16:26:32 -0000	1.2
+++ xchat-gnome-config.patch	5 Apr 2006 04:40:06 -0000	1.3
@@ -1,6 +1,6 @@
-diff -ur xchat-gnome-0.10.OLD/plugins/perl/perl.c xchat-gnome-0.10/plugins/perl/perl.c
---- xchat-gnome-0.10.OLD/plugins/perl/perl.c	2006-02-12 06:06:26.000000000 -0500
-+++ xchat-gnome-0.10/plugins/perl/perl.c	2006-02-24 10:31:02.000000000 -0500
+diff -ur xchat-gnome-0.11.OLD/plugins/perl/perl.c xchat-gnome-0.11/plugins/perl/perl.c
+--- xchat-gnome-0.11.OLD/plugins/perl/perl.c	2006-02-12 06:06:26.000000000 -0500
++++ xchat-gnome-0.11/plugins/perl/perl.c	2006-04-05 00:04:55.000000000 -0400
 @@ -93,7 +93,7 @@
  	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
  		xdir = xchat_get_info (ph, "xchatdir");
@@ -10,9 +10,9 @@
  	perl_auto_load_from_path (xdir);
  
  #ifdef WIN32
-diff -ur xchat-gnome-0.10.OLD/plugins/python/python.c xchat-gnome-0.10/plugins/python/python.c
---- xchat-gnome-0.10.OLD/plugins/python/python.c	2006-02-12 06:06:26.000000000 -0500
-+++ xchat-gnome-0.10/plugins/python/python.c	2006-02-24 10:30:43.000000000 -0500
+diff -ur xchat-gnome-0.11.OLD/plugins/python/python.c xchat-gnome-0.11/plugins/python/python.c
+--- xchat-gnome-0.11.OLD/plugins/python/python.c	2006-02-12 06:06:26.000000000 -0500
++++ xchat-gnome-0.11/plugins/python/python.c	2006-04-05 00:04:20.000000000 -0400
 @@ -392,7 +392,7 @@
  		return expanded;
  	g_free(expanded);
@@ -22,9 +22,9 @@
  	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
  				    filename, NULL);
  	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-diff -ur xchat-gnome-0.10.OLD/src/common/cfgfiles.c xchat-gnome-0.10/src/common/cfgfiles.c
---- xchat-gnome-0.10.OLD/src/common/cfgfiles.c	2006-02-12 06:06:30.000000000 -0500
-+++ xchat-gnome-0.10/src/common/cfgfiles.c	2006-02-24 10:31:35.000000000 -0500
+diff -ur xchat-gnome-0.11.OLD/src/common/cfgfiles.c xchat-gnome-0.11/src/common/cfgfiles.c
+--- xchat-gnome-0.11.OLD/src/common/cfgfiles.c	2006-04-01 18:22:28.000000000 -0500
++++ xchat-gnome-0.11/src/common/cfgfiles.c	2006-04-05 00:02:52.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -43,9 +43,9 @@
  	}
  }
  
-diff -ur xchat-gnome-0.10.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.10/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.10.OLD/src/fe-gnome/preferences-page-plugins.c	2006-02-12 06:06:33.000000000 -0500
-+++ xchat-gnome-0.10/src/fe-gnome/preferences-page-plugins.c	2006-02-24 10:29:52.000000000 -0500
+diff -ur xchat-gnome-0.11.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.11/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.11.OLD/src/fe-gnome/preferences-page-plugins.c	2006-02-12 06:06:33.000000000 -0500
++++ xchat-gnome-0.11/src/fe-gnome/preferences-page-plugins.c	2006-04-05 00:03:56.000000000 -0400
 @@ -176,7 +176,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  

xchat-gnome-libnotify.patch:

Index: xchat-gnome-libnotify.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/xchat-gnome-libnotify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xchat-gnome-libnotify.patch	25 Feb 2006 17:42:09 -0000	1.1
+++ xchat-gnome-libnotify.patch	5 Apr 2006 04:40:06 -0000	1.2
@@ -1,19 +1,19 @@
-diff -ur xchat-gnome-0.10.ORIG/configure xchat-gnome-0.10/configure
---- xchat-gnome-0.10.ORIG/configure	2006-02-24 06:55:07.000000000 -0500
-+++ xchat-gnome-0.10/configure	2006-02-25 12:07:28.000000000 -0500
+diff -ur xchat-gnome-0.11.OLD/configure xchat-gnome-0.11/configure
+--- xchat-gnome-0.11.OLD/configure	2006-04-04 21:36:50.000000000 -0400
++++ xchat-gnome-0.11/configure	2006-04-05 00:08:42.000000000 -0400
 @@ -2437,7 +2437,7 @@
  DBUS_REQUIRED=0.35
  DBUS_GLIB_REQUIRED=0.35
- LIBSEXY_REQUIRED=0.1.4
+ LIBSEXY_REQUIRED=0.1.7
 -LIBNOTIFY_REQUIRED=0.3.2
 +LIBNOTIFY_REQUIRED=0.3.0
  
  
  ac_ext=c
-diff -ur xchat-gnome-0.10.ORIG/plugins/notify-osd/notify-osd.c xchat-gnome-0.10/plugins/notify-osd/notify-osd.c
---- xchat-gnome-0.10.ORIG/plugins/notify-osd/notify-osd.c	2006-02-12 06:06:27.000000000 -0500
-+++ xchat-gnome-0.10/plugins/notify-osd/notify-osd.c	2006-01-10 18:14:49.000000000 -0500
-@@ -66,7 +66,7 @@
+diff -ur xchat-gnome-0.11.OLD/plugins/notify-osd/notify-osd.c xchat-gnome-0.11/plugins/notify-osd/notify-osd.c
+--- xchat-gnome-0.11.OLD/plugins/notify-osd/notify-osd.c	2006-03-08 02:42:36.000000000 -0500
++++ xchat-gnome-0.11/plugins/notify-osd/notify-osd.c	2006-04-05 00:11:35.000000000 -0400
+@@ -67,7 +67,7 @@
  
  	notify = notify_notification_new (summary, message, NULL, NULL);
  	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
@@ -22,7 +22,7 @@
  	if (!notify_notification_show (notify, &error)) {
  		g_warning (_("Failed to send notification: %s\n"), error->message);
  		g_error_free (error);
-@@ -97,7 +97,7 @@
+@@ -98,7 +98,7 @@
  new_msg_cb (char *word[], gpointer data)
  {
  	const char *channel;
@@ -31,12 +31,12 @@
  
  	if (focused)
  		return XCHAT_EAT_NONE;
-@@ -106,19 +106,16 @@
+@@ -107,19 +107,17 @@
  	stripped = xchat_strip (ph, word[2], -1, STRIP_COLORS | STRIP_ATTRS);
  
  	message = g_strdup_printf ("<%s> %s", word[1], stripped);
 -	escaped = g_markup_escape_text(message, strlen(message));
--
+ 
  	if (channel[0] == '#')
  		summary = g_strdup_printf (_("Message in %s"), channel);
  	else


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/xchat-gnome.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xchat-gnome.spec	19 Mar 2006 14:09:39 -0000	1.22
+++ xchat-gnome.spec	5 Apr 2006 04:40:06 -0000	1.23
@@ -2,8 +2,8 @@
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.10
-Release:        5%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -11,7 +11,6 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-screensaver.patch
 Patch2:		%{name}-libnotify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,7 +53,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
-%patch1 -p1 -b .screensaver
 %patch2 -p1 -b .libnotify
 
 
@@ -101,6 +99,10 @@
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
 done
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %preun
@@ -116,6 +118,10 @@
 
 %postun
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files -f %{name}.lang
@@ -125,7 +131,7 @@
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/%{name}/
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -137,6 +143,11 @@
 
 
 %changelog
+* Tue Apr  4 2006 Brian Pepple <bdpepple at ameritech.net> - 0.11-1
+- Update to 0.11
+- Drop screensaver patch.
+- Add scriptlet for gtk+ icon cache.
+
 * Sun Mar 19 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-5
 - Rebuild for libsexy-0.1.8.
 


--- xchat-gnome-screensaver.patch DELETED ---


