rpms/xchat-gnome/F-7 xchat-gnome-0.18-config.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xchat-gnome.spec, 1.37, 1.38 xchat-gnome-0.17-config.patch, 1.1, NONE xchat-gnome-0.17-setup-dialog.patch, 1.1, NONE xchat-gnome-0.17-static.patch, 1.1, NONE
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Tue Jul 10 02:29:00 UTC 2007
Author: bpepple
Update of /cvs/pkgs/rpms/xchat-gnome/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1868
Modified Files:
.cvsignore sources xchat-gnome.spec
Added Files:
xchat-gnome-0.18-config.patch
Removed Files:
xchat-gnome-0.17-config.patch
xchat-gnome-0.17-setup-dialog.patch
xchat-gnome-0.17-static.patch
Log Message:
* Mon Jul 9 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-1
- Drop requires on python, since dep on python-libs will be pulled in.
- Update to 0.18.
- Drop static patch, fixed upstream.
- Drop setup-dialog patch, fixed upstream.
- Update config patch.
xchat-gnome-0.18-config.patch:
--- NEW FILE xchat-gnome-0.18-config.patch ---
diff -ur xchat-gnome-0.18.OLD/plugins/perl/perl.c xchat-gnome-0.18/plugins/perl/perl.c
--- xchat-gnome-0.18.OLD/plugins/perl/perl.c 2007-03-06 17:47:26.000000000 -0500
+++ xchat-gnome-0.18/plugins/perl/perl.c 2007-07-09 10:24:01.000000000 -0400
@@ -92,7 +92,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
Only in xchat-gnome-0.18/plugins/perl: perl.c~
diff -ur xchat-gnome-0.18.OLD/plugins/python/python.c xchat-gnome-0.18/plugins/python/python.c
--- xchat-gnome-0.18.OLD/plugins/python/python.c 2007-07-07 16:28:05.000000000 -0400
+++ xchat-gnome-0.18/plugins/python/python.c 2007-07-09 10:24:20.000000000 -0400
@@ -414,7 +414,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))
Only in xchat-gnome-0.18/plugins/python: python.c~
diff -ur xchat-gnome-0.18.OLD/src/common/cfgfiles.c xchat-gnome-0.18/src/common/cfgfiles.c
--- xchat-gnome-0.18.OLD/src/common/cfgfiles.c 2007-06-12 20:03:17.000000000 -0400
+++ xchat-gnome-0.18/src/common/cfgfiles.c 2007-07-09 10:26:09.000000000 -0400
@@ -34,7 +34,7 @@
#ifdef WIN32
#define XCHAT_DIR "X-Chat 2"
#else
-#define XCHAT_DIR ".xchat2"
+#define XCHAT_DIR ".xchat-gnome"
#endif
#define DEF_FONT "Monospace 9"
@@ -351,7 +351,7 @@
#else
if (mkdir (dir, S_IRUSR | S_IWUSR | S_IXUSR) != 0)
#endif
- fe_message (_("Cannot create ~/.xchat2"), FE_MSG_ERROR);
+ fe_message (_("Cannot create ~/.xchat-gnome"), FE_MSG_ERROR);
}
}
Only in xchat-gnome-0.18/src/common: cfgfiles.c~
diff -ur xchat-gnome-0.18.OLD/src/common/fe.h xchat-gnome-0.18/src/common/fe.h
--- xchat-gnome-0.18.OLD/src/common/fe.h 2007-06-12 20:21:16.000000000 -0400
+++ xchat-gnome-0.18/src/common/fe.h 2007-07-09 10:25:46.000000000 -0400
@@ -106,7 +106,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 */
Only in xchat-gnome-0.18/src/common: fe.h~
diff -ur xchat-gnome-0.18.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.18/src/fe-gnome/preferences-page-plugins.c
--- xchat-gnome-0.18.OLD/src/fe-gnome/preferences-page-plugins.c 2007-03-31 07:07:34.000000000 -0400
+++ xchat-gnome-0.18/src/fe-gnome/preferences-page-plugins.c 2007-07-09 10:25:27.000000000 -0400
@@ -240,7 +240,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();
- plugindir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
+ plugindir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
g_free (plugindir);
@@ -434,7 +434,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);
for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
for_files (XCHATLIBDIR "/plugins", "*.py", fe_plugin_add);
Only in xchat-gnome-0.18/src/fe-gnome: preferences-page-plugins.c~
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 2 Apr 2007 13:34:57 -0000 1.15
+++ .cvsignore 10 Jul 2007 02:28:28 -0000 1.16
@@ -1 +1 @@
-xchat-gnome-0.17.tar.bz2
+xchat-gnome-0.18.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 2 Apr 2007 13:34:57 -0000 1.15
+++ sources 10 Jul 2007 02:28:28 -0000 1.16
@@ -1 +1 @@
-bcb8e97a63c0fda6fcba0f88309ea645 xchat-gnome-0.17.tar.bz2
+4976cd34a0e9115c800b5d317e121182 xchat-gnome-0.18.tar.bz2
Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-7/xchat-gnome.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xchat-gnome.spec 17 Apr 2007 00:07:30 -0000 1.37
+++ xchat-gnome.spec 10 Jul 2007 02:28:28 -0000 1.38
@@ -1,6 +1,6 @@
Name: xchat-gnome
-Version: 0.17
-Release: 4%{?dist}
+Version: 0.18
+Release: 1%{?dist}
Summary: GNOME front-end to xchat
Group: Applications/Internet
@@ -8,8 +8,6 @@
URL: http://%{name}.navi.cx/
Source0: http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}-config.patch
-Patch1: %{name}-%{version}-static.patch
-Patch2: %{name}-%{version}-setup-dialog.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel
@@ -24,7 +22,6 @@
BuildRequires: libnotify-devel
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires(pre): GConf2
Requires(post): GConf2
@@ -44,8 +41,6 @@
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .config
-%patch1 -p1 -b .static
-%patch2 -p1 -b .dialog
%build
@@ -131,6 +126,13 @@
%changelog
+* Mon Jul 9 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-1
+- Drop requires on python, since dep on python-libs will be pulled in.
+- Update to 0.18.
+- Drop static patch, fixed upstream.
+- Drop setup-dialog patch, fixed upstream.
+- Update config patch.
+
* Mon Apr 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.17-4
- Add patch to fix setup-dialog. (#236636)
--- xchat-gnome-0.17-config.patch DELETED ---
--- xchat-gnome-0.17-setup-dialog.patch DELETED ---
--- xchat-gnome-0.17-static.patch DELETED ---
More information about the fedora-extras-commits
mailing list