rpms/xchat-gnome/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 xchat-gnome-config.patch, 1.7, 1.8 xchat-gnome.spec, 1.31, 1.32
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Wed Jan 10 20:43:11 UTC 2007
Author: bpepple
Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8393
Modified Files:
.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec
Log Message:
* Wed Jan 10 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.16-1
- Update to 0.16.
- Move themeable app icon to correct directory.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 29 Oct 2006 14:44:00 -0000 1.13
+++ .cvsignore 10 Jan 2007 20:42:41 -0000 1.14
@@ -1 +1 @@
-xchat-gnome-0.15.tar.bz2
+xchat-gnome-0.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 29 Oct 2006 14:44:00 -0000 1.13
+++ sources 10 Jan 2007 20:42:41 -0000 1.14
@@ -1 +1 @@
-a0f1f011e594d85a5a5781cfc5f52221 xchat-gnome-0.15.tar.bz2
+2b2a4f42b9ea8cbcd15e1ad597cc8b33 xchat-gnome-0.16.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchat-gnome-config.patch 29 Oct 2006 14:44:00 -0000 1.7
+++ xchat-gnome-config.patch 10 Jan 2007 20:42:41 -0000 1.8
@@ -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 @@
#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 @@
}
}
-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 @@
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);
Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xchat-gnome.spec 9 Dec 2006 00:31:59 -0000 1.31
+++ xchat-gnome.spec 10 Jan 2007 20:42:41 -0000 1.32
@@ -1,8 +1,8 @@
%define with_libnotify 1
Name: xchat-gnome
-Version: 0.15
-Release: 2%{?dist}
+Version: 0.16
+Release: 1%{?dist}
Summary: GNOME front-end to xchat
Group: Applications/Internet
@@ -66,6 +66,20 @@
--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 +138,6 @@
%{_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 +148,10 @@
%changelog
+* Wed Jan 10 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.16-1
+- Update to 0.16.
+- Move themeable app icon to correct directory.
+
* Fri Dec 8 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-2
- Rebuild for new python.
More information about the scm-commits
mailing list