diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 28b7725..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -xchat-gnome-0.13.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..702d66b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +xchat-gnome-0.16.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 032c409..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xchat-gnome -# $Id$ -NAME := xchat-gnome -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 05dc245..7616e88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5614773724afa0c2e617615722e10091 xchat-gnome-0.13.tar.bz2 +2b2a4f42b9ea8cbcd15e1ad597cc8b33 xchat-gnome-0.16.tar.bz2 diff --git a/xchat-gnome-config.patch b/xchat-gnome-config.patch index 7594470..01eed5e 100644 --- a/xchat-gnome-config.patch +++ b/xchat-gnome-config.patch @@ -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/ exists. */ -+ /* Check if ~/.xchat-gnome/ 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.16.OLD/src/common/cfgfiles.c xchat-gnome-0.16/src/common/cfgfiles.c +--- xchat-gnome-0.16.OLD/src/common/cfgfiles.c 2006-11-01 03:26:06.000000000 -0500 ++++ xchat-gnome-0.16/src/common/cfgfiles.c 2007-01-10 10:50:45.000000000 -0500 @@ -34,7 +34,7 @@ #ifdef WIN32 #define XCHAT_DIR "X-Chat 2" @@ -34,7 +10,7 @@ diff -ur xchat-gnome-0.13.OLD/src/common/cfgfiles.c xchat-gnome-0.13/src/common/ #endif #define DEF_FONT "Monospace 9" -@@ -347,7 +347,7 @@ +@@ -348,7 +348,7 @@ #else if (mkdir (dir, S_IRUSR | S_IWUSR | S_IXUSR) != 0) #endif @@ -43,10 +19,10 @@ diff -ur xchat-gnome-0.13.OLD/src/common/cfgfiles.c xchat-gnome-0.13/src/common/ } } -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.16.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.16/src/fe-gnome/preferences-page-plugins.c +--- xchat-gnome-0.16.OLD/src/fe-gnome/preferences-page-plugins.c 2007-01-01 03:49:04.000000000 -0500 ++++ xchat-gnome-0.16/src/fe-gnome/preferences-page-plugins.c 2007-01-10 10:52:17.000000000 -0500 +@@ -244,7 +244,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,12 +31,12 @@ diff -ur xchat-gnome-0.13.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnom gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir); g_free (plugindir); -@@ -346,7 +346,7 @@ - #endif +@@ -446,7 +446,7 @@ + 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); - pageref = page; for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add); for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add); + for_files (XCHATLIBDIR "/plugins", "*.py", fe_plugin_add); diff --git a/xchat-gnome.spec b/xchat-gnome.spec index f304a52..effb87c 100644 --- a/xchat-gnome.spec +++ b/xchat-gnome.spec @@ -1,13 +1,10 @@ -%define with_dbus 1 -%define with_libnotify 1 - Name: xchat-gnome -Version: 0.13 -Release: 4%{?dist} +Version: 0.16 +Release: 2%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet -License: GPL +License: GPLv2+ URL: http://%{name}.navi.cx/ Source0: http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-config.patch @@ -22,15 +19,7 @@ BuildRequires: scrollkeeper 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} BuildRequires: libnotify-devel -%endif Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") @@ -56,24 +45,34 @@ common settings will be included in the main user interface. . %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 +# Place app icons in correct directory. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ +cp -p $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/48x48/apps/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/48x48/apps/%{name}.png +rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/48x48/apps/ +rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/48x48/ +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/ +cp -p $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/128x128/apps/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/ +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/128x128/apps/%{name}.png +rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/128x128/apps +rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/128x128/ + %clean rm -rf $RPM_BUILD_ROOT @@ -82,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; 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 || : @@ -92,7 +91,7 @@ fi %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 +106,7 @@ fi %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 || : @@ -130,18 +129,36 @@ fi %{_bindir}/%{name} %{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_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 Aug 2 2007 Brian Pepple - 0.16-2 +- Update license tag. + +* Wed Jan 31 2007 Brian Pepple - 0.16-2 +- Drop conditional statement for libnotify. +- Remove BR on dbus-devel, since libnotify-devel will pull this in. +- Move themeable app icon to correct directory. + +* Sun Oct 29 2006 Brian Pepple - 0.15-1 +- Update to 0.15. +- Add new icons. + +* Thu Oct 26 2006 Brian Pepple - 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 - 0.13-4 - Add BR for perl(XML::Parser).