From 96ab11b705571d4a2a6b6442cdac8e166689d896 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jul 04 2007 10:21:54 +0000 Subject: 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 --- diff --git a/.cvsignore b/.cvsignore index 983a86b..01fb2f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xchat-2.8.2.tar.bz2 +xchat-2.8.4.tar.bz2 diff --git a/sources b/sources index e998ecc..79c3a17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d87a93bcd39d96ff3a3d0f8199efcf12 xchat-2.8.2.tar.bz2 +66d60febc62a01bafac9bb3a35fb37ae xchat-2.8.4.tar.bz2 diff --git a/xc282-fixtrayzombies.diff b/xc282-fixtrayzombies.diff deleted file mode 100644 index 69a6050..0000000 --- a/xc282-fixtrayzombies.diff +++ /dev/null @@ -1,14 +0,0 @@ -# -# Fix defunc processes created by opening tray balloons -# ---- xchat-2.8.2/src/fe-gtk/plugin-tray.c 20 May 2007 11:08:03 -0000 1.21 -+++ xchat-2.8.2p1/src/fe-gtk/plugin-tray.c 31 May 2007 13:12:19 -0000 -@@ -148,7 +148,7 @@ - argv[5] = title; - argv[6] = text = strip_color (text, -1, STRIP_ALL); - argv[7] = NULL; -- util_execv (argv); -+ xchat_execv (argv); - g_free ((char *)path); - free ((char *)text); - } diff --git a/xchat-2.4.4-redhat-desktop.patch b/xchat-2.4.4-redhat-desktop.patch deleted file mode 100644 index c175fa8..0000000 --- a/xchat-2.4.4-redhat-desktop.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- xchat-2.4.4/xchat.desktop.pre 2005-06-27 02:58:18.000000000 -0400 -+++ xchat-2.4.4/xchat.desktop 2005-06-27 08:25:51.000000000 -0400 -@@ -1,22 +1,9 @@ - [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=IRC Client -+Name=IRC -+Comment=X-Chat - Exec=xchat - Icon=xchat.png - Terminal=false - Type=Application --Categories=Application;Network; -+Categories=X-Red-Hat-Extras;Application;Network; diff --git a/xchat-2.8.2-disable-tray-icon-by-default.patch b/xchat-2.8.2-disable-tray-icon-by-default.patch deleted file mode 100644 index 79a6564..0000000 --- a/xchat-2.8.2-disable-tray-icon-by-default.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xchat-2.8.2/src/common/cfgfiles.c xchat-2.8.2-disable-tray-icon-by-default/src/common/cfgfiles.c ---- xchat-2.8.2/src/common/cfgfiles.c 2007-03-26 04:46:05.000000000 +0200 -+++ xchat-2.8.2-disable-tray-icon-by-default/src/common/cfgfiles.c 2007-06-02 20:48:21.000000000 +0200 -@@ -663,7 +663,7 @@ - prefs.autoopendccchatwindow = 1; - prefs.userhost = 1; - prefs.gui_url_mod = 4; /* ctrl */ -- prefs.gui_tray = 1; -+ prefs.gui_tray = 0; - prefs._gui_tray_blink = 0xfc920; /* 1111 1100 1001 0010 0000 */ - prefs.mainwindow_save = 1; - prefs.bantype = 2; diff --git a/xchat-2.8.4-disable-tray-icon-by-default.patch b/xchat-2.8.4-disable-tray-icon-by-default.patch new file mode 100644 index 0000000..5466815 --- /dev/null +++ b/xchat-2.8.4-disable-tray-icon-by-default.patch @@ -0,0 +1,12 @@ +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; diff --git a/xchat-2.8.4-redhat-desktop.patch b/xchat-2.8.4-redhat-desktop.patch new file mode 100644 index 0000000..deb355e --- /dev/null +++ b/xchat-2.8.4-redhat-desktop.patch @@ -0,0 +1,30 @@ +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 diff --git a/xchat.spec b/xchat.spec index b475d66..4d8a245 100644 --- a/xchat.spec +++ b/xchat.spec @@ -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 @@ Source: http://www.xchat.org/files/source/2.8/xchat-%{version}.tar.bz2 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: dbus-devel >= 0.60, dbus-glib-devel >= 0.60 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 @@ This package contains the X-Chat plugin providing the Tcl scripting interface. %prep %setup -q -%patch0 -p1 %patch10 -p1 -b .desktop-file %patch12 -p0 -b .use-sysconf-to-detect-cpus @@ -82,11 +81,10 @@ export LDFLAGS=$(perl -MExtUtils::Embed -e ldopts) --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 @@ make %{?_smp_mflags} %{__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 @@ fi %{_libdir}/xchat/plugins/tcl.so %changelog +* Wed Jul 4 2007 Kevin Kofler - 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 - 1:2.8.2-12 +- install the .desktop file with --vendor="" to keep the old name + +* Thu Jun 21 2007 Kevin Kofler - 1:2.8.2-11 +- add missing BR desktop-file-utils + +* Thu Jun 21 2007 Kevin Kofler - 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 - 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 - 1:2.8.2-8 - disable tray icon by default (#241923)