rpms/xchat/devel xchat-2.6.6-fi.patch, NONE, 1.1 xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch, NONE, 1.1 xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xchat.spec, 1.54, 1.55 xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch, 1.2, NONE xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Aug 18 00:56:11 UTC 2006 

Author: wtogami

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2382

Modified Files:
	.cvsignore sources xchat.spec 
Added Files:
	xchat-2.6.6-fi.patch 
	xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch 
	xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch 
Removed Files:
	xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch 
	xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch 
Log Message:
- disable gtkspell because it breaks Input Method commit
- apply upstream fi patch
- Update to 2.6.6


xchat-2.6.6-fi.patch:
 fi.po |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xchat-2.6.6-fi.patch ---
#
# Fixes an error in the Finnish translation that would
# cause highlighted messages not to wrap properly.
#
--- xchat-2.6.6/po/fi.po	2006-07-18 12:50:31.000000000 +1000
+++ xchat-2.6.6p1/po/fi.po	2006-07-30 12:51:16.000000000 +1000
@@ -734,7 +734,7 @@
 
 #: src/common/textevents.h:63
 msgid "$4%C21%B%H<%H$1%H>%H%O%C21$t$2"
-msgstr "$4%C21%B%H<%H$1%H%O%C21$t$2"
+msgstr "$4%C21%B%H<%H$1%H>%H%O%C21$t$2"
 
 #: src/common/textevents.h:66
 msgid "%C28-%C29$1/$2%C28-%O$t$3"


xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch:
 xchat.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch ---
--- xchat-2.6.6/src/common/xchat.c.orig	2006-08-02 23:07:47.000000000 -0400
+++ xchat-2.6.6/src/common/xchat.c	2006-08-02 23:10:16.000000000 -0400
@@ -578,7 +578,7 @@
 #ifdef WIN32
 static char defaultconf_urlhandlers[] =
 	"NAME Connect as IRC server\n"		"CMD url %s\n\n";
-#else
+#elif 0
 static char defaultconf_urlhandlers[] =
 	"NAME SUB\n"								"CMD Epiphany...\n\n"\
 		"NAME Open\n"							"CMD !epiphany '%s'\n\n"\
@@ -626,6 +626,9 @@
 		"NAME Ping\n"							"CMD !"XTERM"ping -c 4 %s\n\n"\
 	"NAME ENDSUB\n"							"CMD \n\n"\
 	"NAME Connect as IRC server\n"		"CMD url %s\n\n";
+#else
+static char defaultconf_urlhandlers[] =
+	"NAME Open URL in Web Browser\n"	"CMD !gnome-open '%s'\n\n";
 #endif
 #endif
 

xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch:
 xchat.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch ---
--- xchat-2.6.6/src/common/xchat.c.orig	2006-08-02 23:07:47.000000000 -0400
+++ xchat-2.6.6/src/common/xchat.c	2006-08-02 23:10:16.000000000 -0400
@@ -578,7 +578,7 @@
 #ifdef WIN32
 static char defaultconf_urlhandlers[] =
 	"NAME Connect as IRC server\n"		"CMD url %s\n\n";
-#else
+#elif 0
 static char defaultconf_urlhandlers[] =
 	"NAME SUB\n"								"CMD Epiphany...\n\n"\
 		"NAME Open\n"							"CMD !epiphany '%s'\n\n"\
@@ -626,6 +626,9 @@
 		"NAME Ping\n"							"CMD !"XTERM"ping -c 4 %s\n\n"\
 	"NAME ENDSUB\n"							"CMD \n\n"\
 	"NAME Connect as IRC server\n"		"CMD url %s\n\n";
+#else
+static char defaultconf_urlhandlers[] =
+	"NAME Open URL in Web Browser\n"	"CMD !htmlview '%s'\n\n";
 #endif
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	10 Nov 2005 16:48:03 -0000	1.21
+++ .cvsignore	18 Aug 2006 00:56:08 -0000	1.22
@@ -1,4 +1 @@
-xchat-2.4.3.tar.bz2
-xchat-2.4.4.tar.bz2
-xchat-2.4.5.tar.bz2
-xchat-2.6.0.tar.bz2
+xchat-2.6.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	10 Nov 2005 16:48:03 -0000	1.21
+++ sources	18 Aug 2006 00:56:08 -0000	1.22
@@ -1 +1 @@
-0c827bf6df0572231cbbb1e25965fb61  xchat-2.6.0.tar.bz2
+43c187582beb31e744c4c5a833a022b5  xchat-2.6.6.tar.bz2


Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xchat.spec	19 Jul 2006 15:18:39 -0000	1.54
+++ xchat.spec	18 Aug 2006 00:56:08 -0000	1.55
@@ -4,29 +4,30 @@
 
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
-Version:   2.6.0
-Release:   6
+Version:   2.6.6
+Release:   2%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
 URL:       http://www.xchat.org
-Source:    http://www.xchat.org/files/source/2.0/xchat-%{version}.tar.bz2
+Source:    http://www.xchat.org/files/source/2.6/xchat-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 # Patches 0-9 reserved for official xchat.org patches
 
 Patch10: xchat-2.4.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
 Patch19: xchat-2.0.2-freenode.patch
-Patch22: xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch
-Patch23: xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch
+Patch22: xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch
+Patch23: xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch
 Patch33: xchat-2.4.3-im_context_filter_keypress.patch
 # filed as 1262423 in the xchat bug tracker
 Patch34: xchat-2.4.4-unrealize.patch
 
-Patch35: xchat-2.6.0-dbus-api.patch
+# upstream 2.6.6 fi patch
+Patch35: xchat-2.6.6-fi.patch
 
 BuildRequires: perl python-devel openssl-devel pkgconfig
-BuildRequires: GConf2-devel
+BuildRequires: GConf2-devel, gtkspell-devel
 BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.0.3, gtk2-devel >= 2.0.3, bison >= 1.35
 BuildRequires: gettext /bin/sed
@@ -35,6 +36,7 @@
 Requires(post): GConf2
 # Ensure that a compatible libperl is installed
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: gtkspell
 
 %description
 X-Chat is an easy to use graphical IRC chat client for the X Window
@@ -53,7 +55,7 @@
 %endif
 %patch33 -p1 -b .im_context_filter_keypress
 %patch34 -p1 -b .unrealize
-%patch35 -p1 -b .dbus-api
+%patch35 -p1 -b .fi266
 
 %build
 # Remove CVS files from source dirs so they're not installed into doc dirs.
@@ -67,7 +69,10 @@
            --enable-openssl \
            --enable-python \
 	   --disable-tcl \
-           --enable-ipv6
+           --enable-ipv6 
+
+# Spell checking breaks Input Method commit with ENTER
+#           --enable-spell=gtkspell
 
 make %{?_smp_mflags}
 
@@ -112,6 +117,15 @@
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Thu Aug 17 2006 Warren Togami <wtogami at redhat.com> - 1:2.6.6-2
+- disable gtkspell because it breaks Input Method commit
+- apply upstream fi patch
+
+* Wed Aug  2 2006 Marc Deslauriers <marcdeslauriers at videotron.ca> -  1:2.6.6-1
+- Update to 2.6.6
+- Removed upstreamed dbus patch
+- Enabled gtkspell support
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> -  1:2.6.0-6
 - Rebuild against dbus
 


--- xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch DELETED ---


--- xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch DELETED ---

More information about the fedora-cvs-commits mailing list