--- a/ChangeLog	Sun Jan 07 05:00:58 2007 +0000
+++ b/ChangeLog	Sun Jan 07 05:30:37 2007 +0000
@@ -1,3 +1,10 @@
+2007-01-07  Laszlo (Laca) Peter  <[email protected]>
+
+	* SFExchat.spec: bump to 2.8.0; update patches and %files
+	* patches/xchat-01-gettext.diff: merge
+	* patches/xchat-03-dbus-LDADD.diff: (new) split from gettext.diff
+	  and merged for 2.8.0.
+
 2007-01-06  Laszlo (Laca) Peter  <[email protected]>
 
 	* SFEallegro.spec: make /usr/gnu compliant

--- a/SFExchat.spec	Sun Jan 07 05:00:58 2007 +0000
+++ b/SFExchat.spec	Sun Jan 07 05:30:37 2007 +0000
@@ -10,10 +10,11 @@
 
 Name:                    SFExchat
 Summary:                 XChat IRC Client
-Version:                 2.6.6
-Source:                  http://www.xchat.org/files/source/2.6/xchat-%{version}.tar.bz2
+Version:                 2.8.0
+Source:                  http://www.xchat.org/files/source/2.8/xchat-%{version}.tar.bz2
 Patch1:                  xchat-01-gettext.diff
 Patch2:                  xchat-02-zero-index.diff
+Patch3:                  xchat-03-dbus-LDADD.diff
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -46,8 +47,9 @@
 
 %prep
 %setup -q -n xchat-%version
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .patch01
+%patch2 -p1 -b .patch02
+%patch3 -p1 -b .patch03
 touch NEWS
 
 %build
@@ -134,6 +136,9 @@
 %{_datadir}/applications/*
 %dir %attr (0755, root, other) %{_datadir}/pixmaps
 %{_datadir}/pixmaps/*
+%if %{with_dbus}
+%{_datadir}/dbus-1/services/org.xchat.*
+%endif
 
 %if %{with_dbus}
 %files root
@@ -150,6 +155,8 @@
 %endif
 
 %changelog
+* Sun Jan  7 2007 - [email protected]
+- bump to 2.8.0, merge patches, update %files
 * Mon Jul 31 2006 - [email protected]
 - bump to 2.6.6
 * Mon Jun 12 2006 - [email protected]

--- a/patches/xchat-01-gettext.diff	Sun Jan 07 05:00:58 2007 +0000
+++ b/patches/xchat-01-gettext.diff	Sun Jan 07 05:30:37 2007 +0000
@@ -1,9 +1,9 @@
---- xchat-2.6.1/configure.in-orig	2006-01-26 18:27:40.758485000 -0800
-+++ xchat-2.6.1/configure.in	2006-01-26 18:26:48.928474000 -0800
-@@ -11,7 +11,13 @@ AM_DISABLE_STATIC
- AM_PROG_LIBTOOL
+--- xchat-2.8.0/configure.in.patch01	2007-01-02 22:33:58.000000000 -0500
++++ xchat-2.8.0/configure.in	2007-01-07 00:12:44.563299000 -0500
+@@ -26,7 +26,13 @@
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
  
- ALL_LINGUAS="de el es fi fr gl hu ja ko nl pa sq sr sv vi zh_TW"
+ ALL_LINGUAS="be cs de el es fi fr gl hu it ja ko lt nl pa pt ru sq sr sv vi zh_TW"
 -AM_GNU_GETTEXT
 +AM_GLIB_GNU_GETTEXT
 +USE_INCLUDED_LIBINTL=no
@@ -15,7 +15,7 @@
  
  dnl displaced from acconfig.h
  AH_VERBATIM([OLD_PERL],[#undef OLD_PERL])
-@@ -297,7 +301,7 @@ if test "$python" = yes; then
+@@ -307,7 +313,7 @@
                          PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'`
                          PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'`
                          if test -f $PY_INC/Python.h; then
@@ -24,19 +24,3 @@
                                  PY_CFLAGS="-I$PY_INC"
                                  AC_MSG_RESULT(ok)
                          else
---- xchat-2.6.2/plugins/dbus/Makefile.am.orig	2006-05-08 17:23:47.327109000 +0100
-+++ xchat-2.6.2/plugins/dbus/Makefile.am	2006-05-08 17:25:28.749172000 +0100
-@@ -20,11 +20,11 @@
- 
- bin_PROGRAMS = xchat-remote
- xchat_remote_SOURCES = xchat-remote.c 
--xchat_remote_LDADD = $(DBUS_LIBS) $(GLIB_LIBS)
-+xchat_remote_LDADD = $(DBUS_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
- 
- noinst_PROGRAMS = example
- example_SOURCES = example.c 
--example_LDADD = $(DBUS_LIBS) $(GLIB_LIBS)
-+example_LDADD = $(DBUS_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
- 
- INCLUDES =					\
- 	$(COMMON_CFLAGS)			\

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/xchat-03-dbus-LDADD.diff	Sun Jan 07 05:30:37 2007 +0000
@@ -0,0 +1,11 @@
+--- xchat-2.8.0/src/common/dbus/Makefile.am.patch03	2007-01-07 00:18:46.729862000 -0500
++++ xchat-2.8.0/src/common/dbus/Makefile.am	2007-01-07 00:19:26.933990000 -0500
+@@ -23,7 +23,7 @@
+ 
+ noinst_PROGRAMS = example
+ example_SOURCES = example.c 
+-example_LDADD = $(DBUS_LIBS) $(GLIB_LIBS)
++example_LDADD = $(DBUS_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+ 
+ remote-object-glue.h: remote-object.xml
+ 	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=remote_object --mode=glib-server --output=$@ $<