rpms/xchat-gnome/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xchat-gnome-config.patch, 1.5, 1.6 xchat-gnome.spec, 1.28, 1.29

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Fri Oct 27 14:11:54 UTC 2006 

Author: bpepple

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

Modified Files:
	.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec 
Log Message:
* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
- Update to 0.14.
- Remove xchat-gnome-remote.
- Drop X-Fedora desktop category.
- Use disable-schemas-install & disable-static with configure.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2006 15:42:35 -0000	1.11
+++ .cvsignore	27 Oct 2006 14:11:24 -0000	1.12
@@ -1 +1 @@
-xchat-gnome-0.13.tar.bz2
+xchat-gnome-0.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Jul 2006 15:42:35 -0000	1.11
+++ sources	27 Oct 2006 14:11:24 -0000	1.12
@@ -1 +1 @@
-5614773724afa0c2e617615722e10091  xchat-gnome-0.13.tar.bz2
+8686d5328541404415df486fa115eb6d  xchat-gnome-0.14.tar.bz2

xchat-gnome-config.patch:

Index: xchat-gnome-config.patch
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome-config.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchat-gnome-config.patch	26 Jul 2006 15:42:35 -0000	1.5
+++ xchat-gnome-config.patch	27 Oct 2006 14:11:24 -0000	1.6
@@ -1,30 +1,6 @@
-diff -ur xchat-gnome-0.13.OLD/plugins/perl/perl.c xchat-gnome-0.13/plugins/perl/perl.c
---- xchat-gnome-0.13.OLD/plugins/perl/perl.c	2006-05-01 11:31:57.000000000 -0400
-+++ xchat-gnome-0.13/plugins/perl/perl.c	2006-07-26 10:47:56.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");
- 
--	/* 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.13.OLD/plugins/python/python.c xchat-gnome-0.13/plugins/python/python.c
---- xchat-gnome-0.13.OLD/plugins/python/python.c	2005-11-26 02:10:29.000000000 -0500
-+++ xchat-gnome-0.13/plugins/python/python.c	2006-07-26 10:47:32.000000000 -0400
-@@ -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.13.OLD/src/common/cfgfiles.c xchat-gnome-0.13/src/common/cfgfiles.c
---- xchat-gnome-0.13.OLD/src/common/cfgfiles.c	2006-06-17 21:11:18.000000000 -0400
-+++ xchat-gnome-0.13/src/common/cfgfiles.c	2006-07-26 10:46:12.000000000 -0400
+diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/cfgfiles.c
+--- xchat-gnome-0.14.OLD/src/common/cfgfiles.c	2006-10-11 20:31:47.000000000 -0400
++++ xchat-gnome-0.14/src/common/cfgfiles.c	2006-10-26 18:59:21.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -43,10 +19,22 @@
  	}
  }
  
-diff -ur xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c	2006-04-17 18:15:14.000000000 -0400
-+++ xchat-gnome-0.13/src/fe-gnome/preferences-page-plugins.c	2006-07-26 10:47:06.000000000 -0400
-@@ -182,7 +182,7 @@
+diff -ur xchat-gnome-0.14.OLD/src/common/fe.h xchat-gnome-0.14/src/common/fe.h
+--- xchat-gnome-0.14.OLD/src/common/fe.h	2006-10-11 20:31:48.000000000 -0400
++++ xchat-gnome-0.14/src/common/fe.h	2006-10-26 18:59:00.000000000 -0400
+@@ -100,7 +100,7 @@
+ 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 -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c	2006-10-13 00:09:17.000000000 -0400
++++ xchat-gnome-0.14/src/fe-gnome/preferences-page-plugins.c	2006-10-26 18:59:45.000000000 -0400
+@@ -184,7 +184,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();
@@ -55,7 +43,7 @@
  	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
  	g_free (plugindir);
  
-@@ -346,7 +346,7 @@
+@@ -347,7 +347,7 @@
  #endif
  
  	homedir = g_get_home_dir ();


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xchat-gnome.spec	31 Aug 2006 22:42:38 -0000	1.28
+++ xchat-gnome.spec	27 Oct 2006 14:11:24 -0000	1.29
@@ -1,9 +1,8 @@
-%define with_dbus 1
 %define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.13
-Release:        4%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -22,10 +21,7 @@
 BuildRequires:  gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	gnome-doc-utils
-
-%if %{with_dbus}
 BuildRequires:	dbus-devel
-%endif
 
 # Leave as conditional until API is more stable.
 %if %{with_libnotify}
@@ -56,22 +52,18 @@
 
 
 %build
-%configure --disable-tcl --disable-scrollkeeper
+%configure --disable-tcl --disable-scrollkeeper --disable-schemas-install --disable-static
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{l,}a
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	--add-category X-Fedora				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -92,7 +84,7 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 for i in $SCHEMAS; do
 	gconftool-2 --makefile-install-rule \
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -107,7 +99,7 @@
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas url_handler.schemas"
 	for i in $SCHEMAS; do
 		gconftool-2 --makefile-uninstall-rule \
 			%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
@@ -134,14 +126,19 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
+%{_datadir}/dbus-1/services/org.gnome.Xchat.service
+%{_mandir}/man1/%{name}.1.gz
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/plugins/
-%if %{with_dbus}
-%{_bindir}/%{name}-remote
-%endif
 
 
 %changelog
+* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
+- Update to 0.14.
+- Remove xchat-gnome-remote.
+- Drop X-Fedora desktop category.
+- Use disable-schemas-install & disable-static with configure.
+
 * Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.13-4
 - Add BR for perl(XML::Parser).

More information about the scm-commits mailing list