rpms/openoffice.org/F-11 openoffice.org.spec,1.1911,1.1912

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20438/F-11

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#503003 silence warnings on updates


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1911
retrieving revision 1.1912
diff -u -p -r1.1911 -r1.1912
--- openoffice.org.spec	25 May 2009 12:29:09 -0000	1.1911
+++ openoffice.org.spec	28 May 2009 10:02:19 -0000	1.1912
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 11
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3374,7 +3374,7 @@ fi
 
 %pre ogltrans
 # deregister old extension if it is still there
-unopkg remove --shared `grep identifier %{baseinstdir}/extensions/ogltrans.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
+unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/ogltrans.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
 
 %files presentation-minimizer
 %defattr(-,root,root,-)
@@ -3384,7 +3384,7 @@ unopkg remove --shared `grep identifier 
 %pre presentation-minimizer
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` || :
+    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` || :
 fi
 
 %post presentation-minimizer
@@ -3394,7 +3394,7 @@ fi
 %preun presentation-minimizer
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` || :
+    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/sun-presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` || :
 fi
 
 %postun presentation-minimizer
@@ -3409,7 +3409,7 @@ fi
 %pre presenter-screen
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` || :
+    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` || :
 fi
 
 %post presenter-screen
@@ -3419,7 +3419,7 @@ fi
 %preun presenter-screen
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` || :
+    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` || :
 fi
 
 %postun presenter-screen
@@ -3434,7 +3434,7 @@ fi
 %pre pdfimport
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/pdfimport.oxt/description.xml | cut -d '"' -f 2` || :
+    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/pdfimport.oxt/description.xml | cut -d '"' -f 2` || :
 fi
 
 %post pdfimport
@@ -3444,7 +3444,7 @@ fi
 %preun pdfimport
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/pdfimport.oxt/description.xml | cut -d '"' -f 2` || :
+    unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/pdfimport.oxt/description.xml | cut -d '"' -f 2` || :
 fi
 
 %postun pdfimport
@@ -4142,6 +4142,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu May 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4.UNRELEASED
+- Resolves: rhbz#503003 silence warnings on updates
+
 * Mon May 25 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
 - add in the ia64 and arm fixes for the secondary arch people
 - Resolves(partially): rhbz#495901 No default font-width for wmf export