rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.70,1.71

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1909

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b11
- Removed update-desktop-database dependency.
- Resolves: rhbz#463046




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- java-1.6.0-openjdk.spec	8 Sep 2008 13:07:18 -0000	1.70
+++ java-1.6.0-openjdk.spec	22 Sep 2008 14:25:00 -0000	1.71
@@ -212,12 +212,6 @@
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
 Requires(postun): %{_sbindir}/alternatives
-# Post requires update-desktop-database to update desktop database
-# for jnlp files.
-Requires(post):   %{_bindir}/update-desktop-database
-# Postun requires update-desktop-database to update desktop database
-# for jnlp files.
-Requires(postun): %{_bindir}/update-desktop-database
 
 # java-1.6.0-openjdk replaces java-1.7.0-icedtea.
 Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999
@@ -622,7 +616,7 @@
   %{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar
 
 # Update for jnlp handling.
-update-desktop-database -q %{_datadir}/applications || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -643,7 +637,7 @@
 fi
 
 # Update for jnlp handling.
-update-desktop-database -q %{_datadir}/applications || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -903,6 +897,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b11
+- Removed update-desktop-database dependency.
+- Resolves: rhbz#463046
+
 * Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
 - Added rhino requirement.
 - Resolves: rhbz#461336