rpms/xchat-gnome/devel xchat-gnome-0.23.92-config.patch, NONE, 1.1 xchat-gnome-0.23.92-deps.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 xchat-gnome.spec, 1.52, 1.53 xchat-gnome-0.18-config.patch, 1.1, NONE xchat-gnome-0.18-it-translation.patch, 1.1, NONE xchat-gnome-0.18-reconnect.patch, 1.1, NONE xchat-gnome-fix_away_command.patch, 1.2, NONE xchat-gnome-spellchecking.patch, 1.1, NONE

Wed Sep 10 01:07:25 UTC 2008

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3311

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Added Files:
	xchat-gnome-0.23.92-config.patch 
	xchat-gnome-0.23.92-deps.patch 
Removed Files:
	xchat-gnome-0.18-config.patch 
	xchat-gnome-0.18-it-translation.patch 
	xchat-gnome-0.18-reconnect.patch 
	xchat-gnome-fix_away_command.patch 
	xchat-gnome-spellchecking.patch 
Log Message:
* Tue Sep  9 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.92-1
- Update to 0.23.92.
- Add deps patch to correctly set libnotify & libcanberra options.
- Update BR.
- Drop reconnect patch.  Fixed upstream.
- Drop away-command patch.  Fixed upstream.
- Drop spell-checking patch.  Fixed upstream.
- Drop it-translation patch.  Fixed upstream.


xchat-gnome-0.23.92-config.patch:

--- NEW FILE xchat-gnome-0.23.92-config.patch ---
diff -urp xchat-gnome-0.23.92.OLD/plugins/perl/perl.c xchat-gnome-0.23.92/plugins/perl/perl.c
--- xchat-gnome-0.23.92.OLD/plugins/perl/perl.c	2007-03-09 10:42:50.000000000 -0500
+++ xchat-gnome-0.23.92/plugins/perl/perl.c	2008-09-09 19:07:08.000000000 -0400
@@ -92,7 +92,7 @@ perl_auto_load (void)
 	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 -urp xchat-gnome-0.23.92.OLD/plugins/python/python.c xchat-gnome-0.23.92/plugins/python/python.c
--- xchat-gnome-0.23.92.OLD/plugins/python/python.c	2008-09-07 09:18:27.000000000 -0400
+++ xchat-gnome-0.23.92/plugins/python/python.c	2008-09-09 19:06:47.000000000 -0400
@@ -421,7 +421,7 @@ Util_Expand(char *filename)
 		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 -urp xchat-gnome-0.23.92.OLD/src/common/cfgfiles.c xchat-gnome-0.23.92/src/common/cfgfiles.c
--- xchat-gnome-0.23.92.OLD/src/common/cfgfiles.c	2007-09-12 10:12:26.000000000 -0400
+++ xchat-gnome-0.23.92/src/common/cfgfiles.c	2008-09-09 19:05:01.000000000 -0400
@@ -34,7 +34,7 @@
 #ifdef WIN32
 #define XCHAT_DIR "X-Chat 2"
 #else
-#define XCHAT_DIR ".xchat2"
+#define XCHAT_DIR ".xchat-gnome"
 #endif
 #define DEF_FONT "Monospace 9"
 
@@ -351,7 +351,7 @@ check_prefs_dir (void)
 #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 -urp xchat-gnome-0.23.92.OLD/src/common/fe.h xchat-gnome-0.23.92/src/common/fe.h
--- xchat-gnome-0.23.92.OLD/src/common/fe.h	2007-07-09 05:30:58.000000000 -0400
+++ xchat-gnome-0.23.92/src/common/fe.h	2008-09-09 19:05:21.000000000 -0400
@@ -106,7 +106,7 @@ void fe_get_str (char *prompt, char *def
 void fe_get_int (char *prompt, int def, void *callback, void *ud);
 #define FRF_WRITE 1	/* save file */
 #define FRF_MULTIPLE 2	/* multi-select */
-#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
+#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
 #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
 #define FRF_FILTERISINITIAL 16	/* unused */
 #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
diff -urp xchat-gnome-0.23.92.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.23.92/src/fe-gnome/preferences-page-plugins.c
--- xchat-gnome-0.23.92.OLD/src/fe-gnome/preferences-page-plugins.c	2007-07-24 05:24:39.000000000 -0400
+++ xchat-gnome-0.23.92/src/fe-gnome/preferences-page-plugins.c	2008-09-09 19:06:27.000000000 -0400
@@ -242,7 +242,7 @@ open_plugin_clicked (GtkButton *button, 
 	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);
 
@@ -417,7 +417,7 @@ preferences_page_plugins_check_plugins (
 	xchat_plugin *plugin;
 
 	homedir = g_get_home_dir ();
-	xchatdir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
+	xchatdir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
 	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
 	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
 	for_files (XCHATLIBDIR "/plugins", "*.py", fe_plugin_add);

xchat-gnome-0.23.92-deps.patch:

--- NEW FILE xchat-gnome-0.23.92-deps.patch ---
--- trunk/configure.ac	2008/09/09 20:15:27	2670
+++ trunk/configure.ac	2008/09/09 22:52:52	2671
@@ -122,7 +122,7 @@
   AC_SUBST([LIBNOTIFY_LIBS])
 fi
 
-AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "$enable_notification" = "yes"])
+AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$enable_notification" = "xyes"])
 
 # libcanberra-gtk
 AC_MSG_CHECKING([whether to enable notification sounds using libcanberra])
@@ -137,7 +137,7 @@
   AC_SUBST([LIBCANBERRAGTK_LIBS])
 fi
 
-AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "$enable_canberra" = "yes"])
+AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "x$enable_canberra" = "xyes"])
 
 # GConf
 AM_GCONF_SOURCE_2
@@ -359,7 +359,7 @@
 DIST_PLUGINS="$ALL_PLUGINS $CANBERRA_PLUGINS $DBUS_PLUGINS $LIBNOTIFY_PLUGINS $PYTHON_PLUGINS $PERL_PLUGINS $TCL_PLUGINS"
 
 # canberra specific plugins
-if test "x$libcanberra" = "xyes"; then
+if test "x$enable_canberra" = "xyes"; then
 	ALL_PLUGINS="$ALL_PLUGINS $CANBERRA_PLUGINS"
 else
 	AC_MSG_WARN([xchat-gnome compiled without libcanberra support, plugins $CANBERRA_PLUGINS will not be available])
@@ -373,7 +373,7 @@
 fi
 
 # libnotify-specific plugins
-if test "x$libnotify" = "xyes"; then
+if test "x$enable_notification" = "xyes"; then
 	ALL_PLUGINS="$ALL_PLUGINS $LIBNOTIFY_PLUGINS"
 else
 	AC_MSG_WARN([xchat-gnome compiled without libnotify support, plugins $LIBNOTIFY_PLUGINS will not be available])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	9 Jul 2007 20:25:20 -0000	1.16
+++ .cvsignore	10 Sep 2008 01:06:55 -0000	1.17
@@ -1 +1 @@
-xchat-gnome-0.18.tar.bz2
+xchat-gnome-0.23.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Jul 2007 20:25:20 -0000	1.16
+++ sources	10 Sep 2008 01:06:55 -0000	1.17
@@ -1 +1 @@
-4976cd34a0e9115c800b5d317e121182  xchat-gnome-0.18.tar.bz2
+780963419d487cefa7c1dac14696140c  xchat-gnome-0.23.92.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xchat-gnome.spec	27 Mar 2008 04:38:15 -0000	1.52
+++ xchat-gnome.spec	10 Sep 2008 01:06:55 -0000	1.53
@@ -1,31 +1,42 @@
 Name:           xchat-gnome
-Version:        0.18
-Release:        12%{?dist}
+Version:        0.23.92
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
+# Patch specific to Fedora to use .xchat-gnome, instead of .xchat2
 Patch0:		%{name}-%{version}-config.patch
-Patch1:		%{name}-%{version}-reconnect.patch
-Patch2:		%{name}-fix_away_command.patch
-Patch3:		%{name}-spellchecking.patch
-Patch4:		%{name}-%{version}-it-translation.patch
+# Backported patch to correctly set the libnotify and libcanberra options 
+# http://bugzilla.gnome.org/show_bug.cgi?id=551515
+Patch1:		%{name}-%{version}-deps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
 Buildrequires:	libsexy-devel >= 0.1.11
 BuildRequires:	libgnomeui-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	glib2-devel >= 2.18.0
+BuildRequires:	gtk2-devel >= 2.14.0
+BuildRequires:	libcanberra-devel
 BuildRequires:	python-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:  scrollkeeper
+BuildRequires:	intltool
 BuildRequires:  gettext
 BuildRequires:	perl-devel
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	perl(ExtUtils::Embed)
 BuildRequires:	gnome-doc-utils
-BuildRequires:	libnotify-devel
+# The following BR can be dropped when deps patch is removed.
+BuildRequires: 	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
+BuildRequires:	gettext-devel
+BuildRequires:	gnome-common
+BuildRequires:	gtk-doc
 
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,11 +58,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
-%patch1 -p1 -b .reconnect
-%patch2 -p1 -b .away
-%patch3 -p0 -b .spellchecking
-%patch4 -p1 -b .translation
-
+%patch1 -p1 -b .deps
+autoreconf
 
 %build
 %configure --disable-tcl		\
@@ -139,6 +147,15 @@
 
 
 %changelog
+* Tue Sep  9 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.23.92-1
+- Update to 0.23.92.
+- Add deps patch to correctly set libnotify & libcanberra options.
+- Update BR.
+- Drop reconnect patch.  Fixed upstream.
+- Drop away-command patch.  Fixed upstream.
+- Drop spell-checking patch.  Fixed upstream.
+- Drop it-translation patch.  Fixed upstream.
+
 * Thu Mar 27 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.18-12
 - Add patch to fix italian translation bug. (#431133)
 


--- xchat-gnome-0.18-config.patch DELETED ---


--- xchat-gnome-0.18-it-translation.patch DELETED ---


--- xchat-gnome-0.18-reconnect.patch DELETED ---


--- xchat-gnome-fix_away_command.patch DELETED ---


--- xchat-gnome-spellchecking.patch DELETED ---


