From f328b9861d38bae9901dd52dd82778442a436749 Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@fedoraproject.org>
Date: Jul 15 2007 03:59:00 +0000
Subject: - Use Fedora 8 desktop file categories.

- Use desktop-file-install.
- Bump release number.

---

diff --git a/system-switch-java-desktop.patch b/system-switch-java-desktop.patch
new file mode 100644
index 0000000..ee8b2e6
--- /dev/null
+++ b/system-switch-java-desktop.patch
@@ -0,0 +1,11 @@
+--- ../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
diff --git a/system-switch-java.spec b/system-switch-java.spec
index 762d01f..4e70869 100644
--- a/system-switch-java.spec
+++ b/system-switch-java.spec
@@ -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 @@ the default Java toolset for the system.
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
@@ -41,6 +44,9 @@ make %{?_smp_mflags}
 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 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/security/console.apps/%{name}
 
 %changelog
+* Sat Jul 14 2007 Thomas Fitzsimmons <fitzsim@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@redhat.com> - 1.1.0-2
 - Bump release number.