rpms/openoffice.org/devel openoffice.org.spec,1.1915,1.1916
Caolan McNamara
caolanm at fedoraproject.org
Thu May 28 10:02:51 UTC 2009
- Previous message: rpms/openoffice.org/F-11 openoffice.org.spec,1.1911,1.1912
- Next message: rpms/sysstat/devel .cvsignore, 1.22, 1.23 sources, 1.21, 1.22 sysstat-8.0.4-procdisksts.patch, 1.1, 1.2 sysstat.spec, 1.67, 1.68 sysstat-8.0.4-cpu.patch, 1.1, NONE sysstat-8.0.4-nfs_ext.patch, 1.1, NONE sysstat-8.0.4-write.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20438/devel
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/devel/openoffice.org.spec,v
retrieving revision 1.1915
retrieving revision 1.1916
diff -u -p -r1.1915 -r1.1916
--- openoffice.org.spec 26 May 2009 07:38:33 -0000 1.1915
+++ openoffice.org.spec 28 May 2009 10:02:21 -0000 1.1916
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 12
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -3375,7 +3375,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,-)
@@ -3385,7 +3385,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
@@ -3395,7 +3395,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
@@ -3410,7 +3410,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
@@ -3420,7 +3420,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
@@ -3435,7 +3435,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
@@ -3445,7 +3445,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
@@ -4143,6 +4143,9 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Thu May 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.2
+- Resolves: rhbz#503003 silence warnings on updates
+
* Tue May 26 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.1
- start of 3.1.1 branch
- Previous message: rpms/openoffice.org/F-11 openoffice.org.spec,1.1911,1.1912
- Next message: rpms/sysstat/devel .cvsignore, 1.22, 1.23 sources, 1.21, 1.22 sysstat-8.0.4-procdisksts.patch, 1.1, 1.2 sysstat.spec, 1.67, 1.68 sysstat-8.0.4-cpu.patch, 1.1, NONE sysstat-8.0.4-nfs_ext.patch, 1.1, NONE sysstat-8.0.4-write.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list