rpms/xchat/F-7 xchat-2.8.4-disable-tray-icon-by-default.patch, NONE, 1.1 xchat-2.8.4-redhat-desktop.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 xchat.spec, 1.70, 1.71 xc282-fixtrayzombies.diff, 1.1, NONE xchat-2.4.4-redhat-desktop.patch, 1.3, NONE xchat-2.8.2-disable-tray-icon-by-default.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30095/F-7

Modified Files:
	.cvsignore sources xchat.spec 
Added Files:
	xchat-2.8.4-disable-tray-icon-by-default.patch 
	xchat-2.8.4-redhat-desktop.patch 
Removed Files:
	xc282-fixtrayzombies.diff xchat-2.4.4-redhat-desktop.patch 
	xchat-2.8.2-disable-tray-icon-by-default.patch 
Log Message:
XChat 2.8.4:
- update to 2.8.4
- drop xc282-fixtrayzombies.diff (already in 2.8.4)
- rebase redhat-desktop and tray-icon patches

Also merge cleanups from devel:
- build against system libsexy instead of static sexy-spell-entry now that this is possible (Core-Extras merge)
- .desktop file cleanups requested by merge review: remove Application; and X-Red-Hat-Extras; categories, use desktop-file-install

xchat-2.8.4-disable-tray-icon-by-default.patch:

--- NEW FILE xchat-2.8.4-disable-tray-icon-by-default.patch ---
diff -ur xchat-2.8.4/src/common/cfgfiles.c xchat-2.8.4-disable-tray-icon-by-default/src/common/cfgfiles.c
--- xchat-2.8.4/src/common/cfgfiles.c	2007-06-17 08:11:42.000000000 +0200
+++ xchat-2.8.4-disable-tray-icon-by-default/src/common/cfgfiles.c	2007-07-04 12:05:21.000000000 +0200
@@ -670,7 +670,7 @@
 	prefs.autoopendccchatwindow = 1;
 	prefs.userhost = 1;
 	prefs.gui_url_mod = 4;	/* ctrl */
-	prefs.gui_tray = 1;
+	prefs.gui_tray = 0;
 	prefs.gui_pane_left_size = 100;
 	prefs.gui_pane_right_size = 100;
 	prefs.mainwindow_save = 1;

xchat-2.8.4-redhat-desktop.patch:

--- NEW FILE xchat-2.8.4-redhat-desktop.patch ---
diff -ur xchat-2.8.4/xchat.desktop xchat-2.8.4-redhat-desktop/xchat.desktop
--- xchat-2.8.4/xchat.desktop	2007-06-23 17:50:27.000000000 +0200
+++ xchat-2.8.4-redhat-desktop/xchat.desktop	2007-07-04 12:00:46.000000000 +0200
@@ -1,23 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=XChat IRC
-Name[zh_TW]=網路清談
-Comment[de]=IRC-Client
-Comment[es]=Aplicación de IRC
-Comment[fi]=IRC-sovellus
-Comment[fr]=Client IRC
-Comment[hu]=IRC-kliens
-Comment[lt]=IRC klientas
-Comment[no]=IRC-klient
-Comment[pt_BR]=Cliente de IRC
-Comment[sl]=Odjemalec IRC
-Comment[sv]=IRC-klient
-Comment[ro]=Client de IRC
-Comment[zh_TW]=X-Chat 聊天程式
-Comment=Chat with other people using Internet Relay Chat
+Name=IRC
+Comment=X-Chat
 Exec=xchat
 Icon=xchat.png
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Network;
 StartupNotify=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-7/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	28 May 2007 03:18:03 -0000	1.23
+++ .cvsignore	4 Jul 2007 10:21:54 -0000	1.24
@@ -1 +1 @@
-xchat-2.8.2.tar.bz2
+xchat-2.8.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-7/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	28 May 2007 03:15:59 -0000	1.23
+++ sources	4 Jul 2007 10:21:54 -0000	1.24
@@ -1 +1 @@
-d87a93bcd39d96ff3a3d0f8199efcf12  xchat-2.8.2.tar.bz2
+66d60febc62a01bafac9bb3a35fb37ae  xchat-2.8.4.tar.bz2


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-7/xchat.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- xchat.spec	2 Jun 2007 20:31:35 -0000	1.70
+++ xchat.spec	4 Jul 2007 10:21:54 -0000	1.71
@@ -2,8 +2,8 @@
 
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
-Version:   2.8.2
-Release:   8%{?dist}
+Version:   2.8.4
+Release:   1%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -12,17 +12,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Patches 0-9 reserved for official xchat.org patches
-# Fix defunct processes created by opening tray balloons
-Patch0: xc282-fixtrayzombies.diff
 
-Patch10: xchat-2.4.4-redhat-desktop.patch
+Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
 Patch19: xchat-2.0.2-freenode.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
 # see #241923
-Patch35: xchat-2.8.2-disable-tray-icon-by-default.patch
+Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch
 
 BuildRequires: perl python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
@@ -30,6 +28,8 @@
 BuildRequires: glib2-devel >= 2.10.0, gtk2-devel >= 2.10.0, bison >= 1.35
 BuildRequires: gettext /bin/sed
 BuildRequires: libtool
+BuildRequires: libsexy-devel
+BuildRequires: desktop-file-utils >= 0.10
 # For gconftool-2:
 Requires(post): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
@@ -59,7 +59,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -82,11 +81,10 @@
            --enable-python \
            --enable-tcl=%{_libdir} \
            --enable-ipv6 \
-           --enable-spell=static \
+           --enable-spell=libsexy \
            --enable-shm
 
 # gtkspell breaks Input Method commit with ENTER
-# static works if the optional enchant package is installed
 
 make %{?_smp_mflags}
 
@@ -95,9 +93,14 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-# Get rid of static libs
+# Get rid of libtool archives
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/xchat/plugins/*.la
 
+# Install the .desktop file properly
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applications/xchat.desktop
+desktop-file-install --vendor="" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications xchat.desktop
+
 %find_lang %name
 
 # do not Provide plugins .so
@@ -151,6 +154,26 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Jul  4 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-1
+- update to 2.8.4
+- drop xc282-fixtrayzombies.diff (already in 2.8.4)
+- rebase redhat-desktop and tray-icon patches
+
+* Fri Jun 22 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.2-12
+- install the .desktop file with --vendor="" to keep the old name
+
+* Thu Jun 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.2-11
+- add missing BR desktop-file-utils
+
+* Thu Jun 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.2-10
+- remove Application; and X-Red-Hat-Extras; categories from .desktop file
+  (merge review #226551)
+- install the .desktop file properly (merge review #226551)
+
+* Tue Jun 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.2-9
+- build against system libsexy instead of static sexy-spell-entry now that this
+  is possible (Core-Extras merge)
+
 * Sat Jun  2 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.2-8
 - disable tray icon by default (#241923)
 


--- xc282-fixtrayzombies.diff DELETED ---


--- xchat-2.4.4-redhat-desktop.patch DELETED ---


--- xchat-2.8.2-disable-tray-icon-by-default.patch DELETED ---