rpms/system-switch-java/devel system-switch-java-desktop.patch, NONE, 1.1 system-switch-java.spec, 1.5, 1.6

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/extras/rpms/system-switch-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30600

Modified Files:
	system-switch-java.spec 
Added Files:
	system-switch-java-desktop.patch 
Log Message:
* Sat Jul 14 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-3
- Use Fedora 8 desktop file categories.
- Use desktop-file-install.
- Bump release number.



system-switch-java-desktop.patch:

--- NEW FILE system-switch-java-desktop.patch ---
--- ../system-switch-java-1.1.0.orig/system-switch-java.desktop.in	2007-01-23 15:11:28.000000000 -0500
+++ system-switch-java.desktop.in	2007-07-14 23:15:10.000000000 -0400
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.2
-Categories=Application;SystemSetup;X-Red-Hat-Base;
+Categories=System;Settings;
 _Name=Java Toolset
 _Comment=Change the default Java toolset
 Exec=/usr/bin/system-switch-java


Index: system-switch-java.spec
===================================================================
RCS file: /cvs/extras/rpms/system-switch-java/devel/system-switch-java.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-switch-java.spec	5 Jul 2007 21:55:15 -0000	1.5
+++ system-switch-java.spec	15 Jul 2007 03:59:00 -0000	1.6
@@ -1,15 +1,17 @@
 Name: system-switch-java
 Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A tool for changing the default Java toolset
 
 Group: Applications/System
 License: GPL
 URL: ftp://sources.redhat.com/pub/rhug
 Source0: %{name}-%{version}.tar.gz
+Patch0: %{name}-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python-devel
@@ -32,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
@@ -41,6 +44,9 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 %find_lang %{name}
+desktop-file-install \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -61,6 +67,11 @@
 %config(noreplace) /etc/security/console.apps/%{name}
 
 %changelog
+* Sat Jul 14 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-3
+- Use Fedora 8 desktop file categories.
+- Use desktop-file-install.
+- Bump release number.
+
 * Thu Jul  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-2
 - Bump release number.