From e68a56ec71508e26d41a0a1ddad10f52593dd217 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:33:47 +0000 Subject: [PATCH 1/7] Initialize branch FC-6 for xchat-gnome --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 086f08ecaf5b2490b064c2a8bc6e619a01d6415d Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Fri, 27 Oct 2006 14:11:24 +0000 Subject: [PATCH 2/7] - Update to 0.14. - Remove xchat-gnome-remote. - Drop X-Fedora desktop category. - Use disable-schemas-install & disable-static with configure. --- .cvsignore | 2 +- sources | 2 +- xchat-gnome-config.patch | 52 ++++++++++++++++------------------------ xchat-gnome.spec | 31 +++++++++++------------- 4 files changed, 36 insertions(+), 51 deletions(-) diff --git a/.cvsignore b/.cvsignore index 28b7725..9beabf6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xchat-gnome-0.13.tar.bz2 +xchat-gnome-0.14.tar.bz2 diff --git a/sources b/sources index 05dc245..b041b1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5614773724afa0c2e617615722e10091 xchat-gnome-0.13.tar.bz2 +8686d5328541404415df486fa115eb6d xchat-gnome-0.14.tar.bz2 diff --git a/xchat-gnome-config.patch b/xchat-gnome-config.patch index 7594470..472244f 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.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/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.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 @@ 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 @@ +@@ -347,7 +347,7 @@ #endif homedir = g_get_home_dir (); diff --git a/xchat-gnome.spec b/xchat-gnome.spec index f304a52..d385fd9 100644 --- a/xchat-gnome.spec +++ b/xchat-gnome.spec @@ -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: 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} @@ -56,22 +52,18 @@ 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 @@ -92,7 +84,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 +99,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 || : @@ -134,14 +126,19 @@ fi %{_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 - 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). From a8b731612d6f3d3ff9d954c18cd408e1faf5295e Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Sun, 29 Oct 2006 17:56:44 +0000 Subject: [PATCH 3/7] - Update to 0.15. - Add new icons. --- .cvsignore | 2 +- sources | 2 +- xchat-gnome-config.patch | 30 +++++++++++------------------- xchat-gnome.spec | 12 ++++++++++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9beabf6..d5e8f25 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xchat-gnome-0.14.tar.bz2 +xchat-gnome-0.15.tar.bz2 diff --git a/sources b/sources index b041b1b..ff44289 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8686d5328541404415df486fa115eb6d xchat-gnome-0.14.tar.bz2 +a0f1f011e594d85a5a5781cfc5f52221 xchat-gnome-0.15.tar.bz2 diff --git a/xchat-gnome-config.patch b/xchat-gnome-config.patch index 472244f..1fdab2d 100644 --- a/xchat-gnome-config.patch +++ b/xchat-gnome-config.patch @@ -1,6 +1,7 @@ -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 +Only in xchat-gnome-0.15/plugins/python: #python.c# +diff -ur xchat-gnome-0.15.OLD/src/common/cfgfiles.c xchat-gnome-0.15/src/common/cfgfiles.c +--- xchat-gnome-0.15.OLD/src/common/cfgfiles.c 2006-10-11 20:31:47.000000000 -0400 ++++ xchat-gnome-0.15/src/common/cfgfiles.c 2006-10-29 00:12:49.000000000 -0400 @@ -34,7 +34,7 @@ #ifdef WIN32 #define XCHAT_DIR "X-Chat 2" @@ -19,21 +20,11 @@ diff -ur xchat-gnome-0.14.OLD/src/common/cfgfiles.c xchat-gnome-0.14/src/common/ } } -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 +Only in xchat-gnome-0.15/src/common: cfgfiles.c~ +Only in xchat-gnome-0.15/src/common: #fe.h# +diff -ur xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c +--- xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c 2006-10-28 01:48:21.000000000 -0400 ++++ xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c 2006-10-29 00:13:17.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); @@ -43,7 +34,7 @@ diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnom gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir); g_free (plugindir); -@@ -347,7 +347,7 @@ +@@ -346,7 +346,7 @@ #endif homedir = g_get_home_dir (); @@ -52,3 +43,4 @@ diff -ur xchat-gnome-0.14.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnom pageref = page; for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add); for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add); +Only in xchat-gnome-0.15/src/fe-gnome: preferences-page-plugins.c~ diff --git a/xchat-gnome.spec b/xchat-gnome.spec index d385fd9..a5068b5 100644 --- a/xchat-gnome.spec +++ b/xchat-gnome.spec @@ -1,7 +1,7 @@ %define with_libnotify 1 Name: xchat-gnome -Version: 0.14 +Version: 0.15 Release: 1%{?dist} Summary: GNOME front-end to xchat @@ -74,7 +74,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 || : @@ -122,7 +122,11 @@ fi %{_bindir}/%{name} %{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/22x22/apps/%{name}-*.png +%{_datadir}/icons/hicolor/16x16/apps/%{name}-*.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}-plugin.svg %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/omf/%{name}/ %{_datadir}/gnome/help/%{name}/ @@ -133,6 +137,10 @@ fi %changelog +* 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. From fef1cdc76ebab76a7eb9983e44a4950ba123b33c Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Wed, 31 Jan 2007 13:21:37 +0000 Subject: [PATCH 4/7] - Drop conditional statement for libnotify. - Remove BR on dbus-devel, since libnotify-devel will pull this in. - Move themeable app icon to correct directory. --- .cvsignore | 2 +- sources | 2 +- xchat-gnome-config.patch | 26 +++++++++++--------------- xchat-gnome.spec | 31 ++++++++++++++++++++----------- 4 files changed, 33 insertions(+), 28 deletions(-) diff --git a/.cvsignore b/.cvsignore index d5e8f25..702d66b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xchat-gnome-0.15.tar.bz2 +xchat-gnome-0.16.tar.bz2 diff --git a/sources b/sources index ff44289..7616e88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0f1f011e594d85a5a5781cfc5f52221 xchat-gnome-0.15.tar.bz2 +2b2a4f42b9ea8cbcd15e1ad597cc8b33 xchat-gnome-0.16.tar.bz2 diff --git a/xchat-gnome-config.patch b/xchat-gnome-config.patch index 1fdab2d..01eed5e 100644 --- a/xchat-gnome-config.patch +++ b/xchat-gnome-config.patch @@ -1,7 +1,6 @@ -Only in xchat-gnome-0.15/plugins/python: #python.c# -diff -ur xchat-gnome-0.15.OLD/src/common/cfgfiles.c xchat-gnome-0.15/src/common/cfgfiles.c ---- xchat-gnome-0.15.OLD/src/common/cfgfiles.c 2006-10-11 20:31:47.000000000 -0400 -+++ xchat-gnome-0.15/src/common/cfgfiles.c 2006-10-29 00:12:49.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" @@ -11,7 +10,7 @@ diff -ur xchat-gnome-0.15.OLD/src/common/cfgfiles.c xchat-gnome-0.15/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 @@ -20,12 +19,10 @@ diff -ur xchat-gnome-0.15.OLD/src/common/cfgfiles.c xchat-gnome-0.15/src/common/ } } -Only in xchat-gnome-0.15/src/common: cfgfiles.c~ -Only in xchat-gnome-0.15/src/common: #fe.h# -diff -ur xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c ---- xchat-gnome-0.15.OLD/src/fe-gnome/preferences-page-plugins.c 2006-10-28 01:48:21.000000000 -0400 -+++ xchat-gnome-0.15/src/fe-gnome/preferences-page-plugins.c 2006-10-29 00:13:17.000000000 -0400 -@@ -184,7 +184,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(); @@ -34,13 +31,12 @@ diff -ur xchat-gnome-0.15.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); -Only in xchat-gnome-0.15/src/fe-gnome: preferences-page-plugins.c~ + for_files (XCHATLIBDIR "/plugins", "*.py", fe_plugin_add); diff --git a/xchat-gnome.spec b/xchat-gnome.spec index a5068b5..c3c31cd 100644 --- a/xchat-gnome.spec +++ b/xchat-gnome.spec @@ -1,7 +1,5 @@ -%define with_libnotify 1 - Name: xchat-gnome -Version: 0.15 +Version: 0.16 Release: 1%{?dist} Summary: GNOME front-end to xchat @@ -21,12 +19,7 @@ BuildRequires: scrollkeeper BuildRequires: gettext BuildRequires: perl(XML::Parser) BuildRequires: gnome-doc-utils -BuildRequires: dbus-devel - -# 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]") @@ -66,6 +59,20 @@ desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $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 @@ -124,9 +131,6 @@ fi %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%{_datadir}/icons/hicolor/22x22/apps/%{name}-*.png -%{_datadir}/icons/hicolor/16x16/apps/%{name}-*.png -%{_datadir}/icons/hicolor/scalable/apps/%{name}-plugin.svg %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/omf/%{name}/ %{_datadir}/gnome/help/%{name}/ @@ -137,6 +141,11 @@ fi %changelog +* 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. From bea6385fe9330ca2ac069739b579a274160d7012 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Fri, 3 Aug 2007 01:47:37 +0000 Subject: [PATCH 5/7] - Update license tag. --- xchat-gnome.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xchat-gnome.spec b/xchat-gnome.spec index c3c31cd..effb87c 100644 --- a/xchat-gnome.spec +++ b/xchat-gnome.spec @@ -1,10 +1,10 @@ Name: xchat-gnome Version: 0.16 -Release: 1%{?dist} +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 @@ -141,6 +141,9 @@ fi %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. From d854a22d13ea17ba2997cd09f6aa4bc42a18cdad Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:44 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 032c409..02b1948 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b484ee343ef91cf9ab27ea0ca62ddc169d43e981 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:35:48 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 02b1948..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 $$d/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/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6