rpms/xchat-gnome/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xchat-gnome-config.patch, 1.1, 1.2 xchat-gnome.spec, 1.17, 1.18

Fri Feb 24 16:26:33 UTC 2006

Author: bpepple

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

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Fri Feb 24 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-1
- Update to 0.10.
- Add -disable-scrollkeeprer to config.
- Add BR for gnome-doc-utils.
- Disable libnotify plugin, until libnotify is updated in Rawhide.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8

--- .cvsignore	20 Jan 2006 21:36:14 -0000	1.7
+++ .cvsignore	24 Feb 2006 16:26:32 -0000	1.8
@@ -1 +1 @@
-xchat-gnome-0.9.tar.bz2
+xchat-gnome-0.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Jan 2006 21:36:14 -0000	1.7
+++ sources	24 Feb 2006 16:26:32 -0000	1.8
@@ -1 +1 @@
-607d36afbadd35a163464b3f39c93526  xchat-gnome-0.9.tar.bz2
+1ff2b7adfc71592951ee843599a8c8f7  xchat-gnome-0.10.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xchat-gnome-config.patch	12 Nov 2005 14:45:59 -0000	1.1
+++ xchat-gnome-config.patch	24 Feb 2006 16:26:32 -0000	1.2
@@ -1,6 +1,30 @@
-diff -ur xchat-gnome-0.6.OLD/src/common/cfgfiles.c xchat-gnome-0.6/src/common/cfgfiles.c
---- xchat-gnome-0.6.OLD/src/common/cfgfiles.c	2005-10-23 23:13:22.000000000 -0400
-+++ xchat-gnome-0.6/src/common/cfgfiles.c	2005-11-12 00:14:51.000000000 -0500
+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
+@@ -93,7 +93,7 @@
+ 	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
+ 		xdir = xchat_get_info (ph, "xchatdir");
+ 
+-	/* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
++	/* autoload from ~/.xchat-gnome/ or ${APPDATA}\X-Chat 2\ on win32 */
+ 	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
+@@ -392,7 +392,7 @@
+ 		return expanded;
+ 	g_free(expanded);
+ 
+-	/* Check if ~/.xchat2/<filename> exists. */
++	/* Check if ~/.xchat-gnome/<filename> exists. */
+ 	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
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -10,3 +34,33 @@
  #endif
  #define DEF_FONT "Monospace 9"
  
+@@ -347,7 +347,7 @@
+ #else
+ 		if (mkdir (dir, S_IRUSR | S_IWUSR | S_IXUSR) != 0)
+ #endif
+-			fe_message (_("Cannot create ~/.xchat2"), FE_MSG_ERROR);
++			fe_message (_("Cannot create ~/.xchat-gnome"), FE_MSG_ERROR);
+ 	}
+ }
+ 
+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
+@@ -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);
+ 
+ 	homedir = g_get_home_dir();
+-	plugindir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
++	plugindir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
+ 	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
+ 	g_free (plugindir);
+ 
+@@ -304,7 +304,7 @@
+ 	g_signal_connect (G_OBJECT (page->plugins_list),   "row-activated", G_CALLBACK (row_activated),         page);
+ 
+ 	homedir = g_get_home_dir ();
+-	xchatdir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
++	xchatdir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
+ 	pageref = page;
+ 	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
+ 	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xchat-gnome.spec	16 Feb 2006 04:39:26 -0000	1.17
+++ xchat-gnome.spec	24 Feb 2006 16:26:32 -0000	1.18
@@ -1,9 +1,9 @@
 %define with_dbus 1
-%define with_libnotify 1
+%define with_libnotify 0
 
 Name:           xchat-gnome
-Version:        0.9
-Release:        6%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -20,6 +20,7 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
+BuildRequires:	gnome-doc-utils
 
 %if %{with_dbus}
 BuildRequires:	dbus-devel
@@ -54,7 +55,7 @@
 
 
 %build
-%configure --disable-tcl
+%configure --disable-tcl --disable-scrollkeeper
 make %{?_smp_mflags}
 
 
@@ -135,6 +136,12 @@
 
 
 %changelog
+* Fri Feb 24 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-1
+- Update to 0.10.
+- Add -disable-scrollkeeprer to config.
+- Add BR for gnome-doc-utils.
+- Disable libnotify plugin, until libnotify is updated in Rawhide.
+
 * Wed Feb 15 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-6
 - Drop unnecessary BR (libSM-devel & libglade2-devel).
 


