rpms/openoffice.org/devel openoffice.org.spec,1.1655,1.1656

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21410

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#463050 rejig desktop-file-utils, shared-mime-info usage


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1655
retrieving revision 1.1656
diff -u -r1.1655 -r1.1656
--- openoffice.org.spec	19 Sep 2008 11:44:59 -0000	1.1655
+++ openoffice.org.spec	21 Sep 2008 18:12:08 -0000	1.1656
@@ -148,10 +148,6 @@
 Requires: hunspell-en, hyphen-en
 Requires: saxon
 PreReq: gtk2 >= 2.9.4
-Requires(post): shared-mime-info
-Requires(post): desktop-file-utils
-Requires(postun): shared-mime-info
-Requires(postun): desktop-file-utils
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
 Obsoletes: openoffice.org-i18n
@@ -2660,30 +2656,30 @@
 %{oooinstdir}/program/versionrc
 
 %post core
-update-mime-database %{_datadir}/mime > /dev/null
-for theme in hicolor locolor; do
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for theme in hicolor locolor; do
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
         touch --no-create %{_datadir}/icons/$theme
         gtk-update-icon-cache -q %{_datadir}/icons/$theme
       fi
     fi
-  fi
-done
+  done
+fi
 
 %postun core
-update-mime-database %{_datadir}/mime > /dev/null
-for theme in hicolor locolor; do
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for theme in hicolor locolor; do
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
         touch --no-create %{_datadir}/icons/$theme
         gtk-update-icon-cache -q %{_datadir}/icons/$theme
       fi
     fi
-  fi
-done
+  done
+fi
 
 %preun core
 if [ $1 -eq 0 ]; then
@@ -2745,10 +2741,10 @@
 %{_bindir}/ooviewdoc
 
 %post brand
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun brand
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-brand
 %dir %{brinstdir}
@@ -2810,32 +2806,32 @@
 %{_bindir}/broffice.org
 
 %post -n broffice.org-brand
-update-desktop-database -q %{_datadir}/applications
-update-mime-database %{_datadir}/mime > /dev/null
-for theme in hicolor locolor; do
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for theme in hicolor locolor; do
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
         touch --no-create %{_datadir}/icons/$theme
         gtk-update-icon-cache -q %{_datadir}/icons/$theme
       fi
     fi
-  fi
-done
+  done
+fi
 
 %postun -n broffice.org-brand
-update-desktop-database -q %{_datadir}/applications
-update-mime-database %{_datadir}/mime > /dev/null
-for theme in hicolor locolor; do
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  for theme in hicolor locolor; do
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
         touch --no-create %{_datadir}/icons/$theme
         gtk-update-icon-cache -q %{_datadir}/icons/$theme
       fi
     fi
-  fi
-done
+  done
+fi
 
 
 %files base-core
@@ -2900,10 +2896,10 @@
 %{_bindir}/oobase
 
 %post base
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun base
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-base
 %defattr(-,root,root,-)
@@ -2914,10 +2910,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*database*
 
 %post -n broffice.org-base
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-base
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files report-builder
 %defattr(-,root,root,-)
@@ -3162,10 +3158,10 @@
 %{_bindir}/oocalc
 
 %post calc
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun calc
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-calc
 %defattr(-,root,root,-)
@@ -3178,10 +3174,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*spreadsheet*
 
 %post -n broffice.org-calc
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-calc
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files draw-core
 %defattr(-,root,root,-)
@@ -3230,10 +3226,10 @@
 %{_bindir}/oodraw
 
 %post draw
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun draw
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-draw
 %defattr(-,root,root,-)
@@ -3245,10 +3241,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*drawing*
 
 %post -n broffice.org-draw
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-draw
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files emailmerge
 %defattr(-,root,root,-)
@@ -3346,10 +3342,10 @@
 %{_bindir}/oowriter
 
 %post writer
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun writer
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-writer
 %defattr(-,root,root,-)
@@ -3363,10 +3359,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*web*
 
 %post -n broffice.org-writer
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-writer
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files impress-core
 %defattr(-,root,root,-)
@@ -3423,10 +3419,10 @@
 %{_bindir}/ooimpress
 
 %post impress
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun impress
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-impress
 %defattr(-,root,root,-)
@@ -3439,10 +3435,10 @@
 %{_datadir}/mimelnk/application/broffice.org-ms-powerpoint-template*.desktop
 
 %post -n broffice.org-impress
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-impress
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files math-core
 %defattr(-,root,root,-)
@@ -3499,10 +3495,10 @@
 %{_bindir}/oomath
 
 %post math
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun math
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files -n broffice.org-math
 %defattr(-,root,root,-)
@@ -3513,10 +3509,10 @@
 %{_datadir}/mimelnk/application/broffice.org-*formula*
 
 %post -n broffice.org-math
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun -n broffice.org-math
-update-desktop-database -q %{_datadir}/applications
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %files graphicfilter
 %defattr(-,root,root,-)
@@ -3683,9 +3679,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Sep 19 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-6.2
+* Sun Sep 21 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-6.2
 - Tswana, Ukrainian, Urdu spellcheckers
 - Resolves: rhbz#462833 openoffice.org-3.0.0.ooo94069.psprint.defconfig.patch
+- Resolves: rhbz#463050 rejig desktop-file-utils, shared-mime-info usage
 
 * Tue Sep 16 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
 - next candidate