rpms/xchat-gnome/FC-6 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xchat-gnome-config.patch, 1.6, 1.7 xchat-gnome.spec, 1.29, 1.30
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Sun Oct 29 17:57:14 UTC 2006
Author: bpepple
Update of /cvs/extras/rpms/xchat-gnome/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21041
Modified Files:
.cvsignore sources xchat-gnome-config.patch xchat-gnome.spec
Log Message:
* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
- Update to 0.15.
- Add new icons.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 27 Oct 2006 14:11:24 -0000 1.12
+++ .cvsignore 29 Oct 2006 17:56:44 -0000 1.13
@@ -1 +1 @@
-xchat-gnome-0.14.tar.bz2
+xchat-gnome-0.15.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 27 Oct 2006 14:11:24 -0000 1.12
+++ sources 29 Oct 2006 17:56:44 -0000 1.13
@@ -1 +1 @@
-8686d5328541404415df486fa115eb6d xchat-gnome-0.14.tar.bz2
+a0f1f011e594d85a5a5781cfc5f52221 xchat-gnome-0.15.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-gnome-config.patch 27 Oct 2006 14:11:24 -0000 1.6
+++ xchat-gnome-config.patch 29 Oct 2006 17:56:44 -0000 1.7
@@ -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/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 @@
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 @@
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~
Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-6/xchat-gnome.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xchat-gnome.spec 27 Oct 2006 14:11:24 -0000 1.29
+++ xchat-gnome.spec 29 Oct 2006 17:56:44 -0000 1.30
@@ -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 @@
%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 @@
%{_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 @@
%changelog
+* Sun Oct 29 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.15-1
+- Update to 0.15.
+- Add new icons.
+
* Thu Oct 26 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.14-1
- Update to 0.14.
- Remove xchat-gnome-remote.
More information about the scm-commits
mailing list