rpms/xchat/F-11 xchat-2.8.6-connect-mnemonic.patch, NONE, 1.1 xchat-2.8.4-redhat-desktop.patch, 1.2, 1.3 xchat.spec, 1.101, 1.102

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13596/F-11

Modified Files:
	xchat-2.8.4-redhat-desktop.patch xchat.spec 
Added Files:
	xchat-2.8.6-connect-mnemonic.patch 
Log Message:
Sync from devel:

* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.8.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Sat Jul 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-10
- Fixed patch for the "C_onnect" issue (#512034, Edward Sheldrake)

* Thu Jul 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-9
- Fix literal underscore in "C_onnect" button (#512034, Matthias Clasen)

* Mon Jun 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-8
- Change Name in xchat.desktop to XChat IRC (#293841)

xchat-2.8.6-connect-mnemonic.patch:
 gtkutil.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xchat-2.8.6-connect-mnemonic.patch ---
diff -urp xchat-2.8.6.orig/src/fe-gtk/gtkutil.c xchat-2.8.6/src/fe-gtk/gtkutil.c
--- xchat-2.8.6.orig/src/fe-gtk/gtkutil.c	2009-07-18 11:25:02.000000000 +0100
+++ xchat-2.8.6/src/fe-gtk/gtkutil.c	2009-07-18 11:27:01.000000000 +0100
@@ -376,6 +376,7 @@ gtkutil_button (GtkWidget *box, char *st
 	{
 		gtk_button_set_label (GTK_BUTTON (wid), labeltext);
 		gtk_button_set_image (GTK_BUTTON (wid), gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU));
+		gtk_button_set_use_underline (GTK_BUTTON (wid), TRUE);
 		if (box)
 			gtk_container_add (GTK_CONTAINER (box), wid);
 	}

xchat-2.8.4-redhat-desktop.patch:
 xchat.desktop |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: xchat-2.8.4-redhat-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-11/xchat-2.8.4-redhat-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xchat-2.8.4-redhat-desktop.patch	5 Dec 2007 14:56:08 -0000	1.2
+++ xchat-2.8.4-redhat-desktop.patch	7 Aug 2009 12:43:05 -0000	1.3
@@ -1,26 +1,9 @@
 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
+@@ -16,8 +16,8 @@
+ Comment[zh_TW]=X-Chat 聊天程式
+ Comment=Chat with other people using Internet Relay Chat
  Exec=xchat
 -Icon=xchat.png
 +Icon=xchat


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-11/xchat.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- xchat.spec	26 Feb 2009 08:00:41 -0000	1.101
+++ xchat.spec	7 Aug 2009 12:43:05 -0000	1.102
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   7%{?dist}
+Release:   11%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -27,6 +27,8 @@ Patch40: xchat-2.8.4-shm-pixmaps.patch
 # Both the "IRC" and "UTF-8" settings will try to accept both Latin1 and UTF-8
 # when it comes in, however "IRC" sends Latin1, "UTF-8" sends UTF-8.
 Patch41: xchat-2.8.6-default-utf8.patch
+# fix literal underscore in "C_onnect" button (#512034, Edward Sheldrake)
+Patch42: xchat-2.8.6-connect-mnemonic.patch
 
 BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
@@ -75,6 +77,7 @@ This package contains the X-Chat plugin 
 %patch35 -p1 -b .tray-icon
 %patch40 -p1 -b .shm-pixmaps
 %patch41 -p1 -b .default-utf8
+%patch42 -p1 -b .connect-mnemonic
 
 sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
 
@@ -164,6 +167,18 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.8.6-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-10
+- Fixed patch for the "C_onnect" issue (#512034, Edward Sheldrake)
+
+* Thu Jul 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-9
+- Fix literal underscore in "C_onnect" button (#512034, Matthias Clasen)
+
+* Mon Jun 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-8
+- Change Name in xchat.desktop to XChat IRC (#293841)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.8.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild