rpms/xchat/devel xchat-2.8.2-redhat-desktop.patch, NONE, 1.1 xchat.spec, 1.70, 1.71 xchat-2.4.4-redhat-desktop.patch, 1.3, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28879/devel

Modified Files:
	xchat.spec 
Added Files:
	xchat-2.8.2-redhat-desktop.patch 
Removed Files:
	xchat-2.4.4-redhat-desktop.patch 
Log Message:
Merge review (#226551) fixes:
- remove Application; and X-Red-Hat-Extras; categories from .desktop file
- install the .desktop file properly

xchat-2.8.2-redhat-desktop.patch:

--- NEW FILE xchat-2.8.2-redhat-desktop.patch ---
--- 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=Network;


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- xchat.spec	12 Jun 2007 15:56:11 -0000	1.70
+++ xchat.spec	21 Jun 2007 04:14:18 -0000	1.71
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.2
-Release:   9%{?dist}
+Release:   10%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -15,7 +15,7 @@
 # Fix defunct processes created by opening tray balloons
 Patch0: xc282-fixtrayzombies.diff
 
-Patch10: xchat-2.4.4-redhat-desktop.patch
+Patch10: xchat-2.8.2-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
@@ -95,9 +95,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
+desktop-file-install --delete-original --vendor fedora   \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications          \
+  $RPM_BUILD_ROOT%{_datadir}/applications/xchat.desktop
+
 %find_lang %name
 
 # do not Provide plugins .so
@@ -141,7 +146,7 @@
 %dir %{_libdir}/xchat/plugins
 %{_libdir}/xchat/plugins/perl.so
 %{_libdir}/xchat/plugins/python.so
-%{_datadir}/applications/xchat.desktop
+%{_datadir}/applications/fedora-xchat.desktop
 %{_datadir}/pixmaps/*
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 %{_datadir}/dbus-1/services/org.xchat.service.service
@@ -151,6 +156,11 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* 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)


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