rpms/openoffice.org/devel openoffice.org-3.2.0.ooo59648.sw.scaling.patch, NONE, 1.1 openoffice.org.spec, 1.2067, 1.2068

Caolan McNamara caolanm at fedoraproject.org
Thu Nov 12 08:42:56 UTC 2009


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo59648.sw.scaling.patch 
Log Message:
add openoffice.org-3.2.0.ooo59648.sw.scaling.patch

openoffice.org-3.2.0.ooo59648.sw.scaling.patch:
 wrtww8gr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo59648.sw.scaling.patch ---
--- sw/source/filter/ww8/wrtww8gr.cxx	2009-11-10 16:54:31.000000000 -0200
+++ sw/source/filter/ww8/wrtww8gr.cxx	2009-11-10 16:54:47.000000000 -0200
@@ -608,7 +608,7 @@
     substitute the final size and loose on retaining the scaling factor but
     still keep the correct display size anyway.
     */
-    if ( (aGrTwipSz.Width() > USHRT_MAX) || (aGrTwipSz.Height() > USHRT_MAX)
+    if ( (aGrTwipSz.Width() > SHRT_MAX) || (aGrTwipSz.Height() > SHRT_MAX)
         || (aGrTwipSz.Width() < 0 ) || (aGrTwipSz.Height() < 0) )
     {
         aGrTwipSz.Width() = nWidth;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2067
retrieving revision 1.2068
diff -u -p -r1.2067 -r1.2068
--- openoffice.org.spec	10 Nov 2009 10:16:55 -0000	1.2067
+++ openoffice.org.spec	12 Nov 2009 08:42:56 -0000	1.2068
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 4
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -124,6 +124,7 @@ Patch49: workspace.vcl107.patch
 Patch50: openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch
 Patch51: openoffice.org-3.2.0.ooo106523.icc.fixendianandtypes.patch
 Patch52: openoffice.org-3.1.1.ooo105710.svx.loadstorenumbering.patch
+Patch53: openoffice.org-3.2.0.ooo59648.sw.scaling.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1644,6 +1645,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch50 -p1 -b .ooo106497.lingucomponent.langnotfound.patch
 %patch51 -p1 -b .ooo106523.icc.fixendianandtypes.patch
 %patch52 -p1 -b .ooo105710.svx.loadstorenumbering.patch
+%patch53 -p1 -b .ooo59648.sw.scaling.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3256,17 +3258,17 @@ update-desktop-database %{_datadir}/appl
 %pre report-builder
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared com.sun.reportdesigner || :
+    unopkg remove --shared com.sun.reportdesigner > /dev/null 2>&1 || :
 fi
 
 %post report-builder
     # register extension
-    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/sun-report-builder.oxt > /dev/null 2>&1 || :
 
 %preun report-builder
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared com.sun.reportdesigner || :
+    unopkg remove --shared com.sun.reportdesigner > /dev/null 2>&1 || :
 fi
 
 %postun report-builder
@@ -3281,17 +3283,17 @@ fi
 %pre bsh
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip || :
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip > /dev/null 2>&1 || :
 fi
 
 %post bsh
     # register extension
-    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip > /dev/null 2>&1 || :
 
 %preun bsh
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip || :
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip > /dev/null 2>&1 || :
 fi
 
 %postun bsh
@@ -3307,17 +3309,17 @@ fi
 %pre rhino
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip || :
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip > /dev/null 2>&1 || :
 fi
 
 %post rhino
     # register extension
-    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip > /dev/null 2>&1 || :
 
 %preun rhino
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip || :
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip > /dev/null 2>&1 || :
 fi
 
 %postun rhino
@@ -3332,17 +3334,17 @@ fi
 %pre wiki-publisher
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared com.sun.wiki-publisher || :
+    unopkg remove --shared com.sun.wiki-publisher > /dev/null 2>&1 || :
 fi
 
 %post wiki-publisher
     # register extension
-    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt > /dev/null 2>&1 || :
 
 %preun wiki-publisher
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared com.sun.wiki-publisher || :
+    unopkg remove --shared com.sun.wiki-publisher > /dev/null 2>&1 || :
 fi
 
 %postun wiki-publisher
@@ -3378,17 +3380,17 @@ unopkg remove --shared `grep -s identifi
 %pre presentation-minimizer
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared `grep -s 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` > /dev/null 2>&1 || :
 fi
 
 %post presentation-minimizer
     # register extension
-    unopkg add --shared --force --link %{baseinstdir}/extensions/sun-presentation-minimizer.oxt > /dev/null || :
+    unopkg add --shared --force --link %{baseinstdir}/extensions/sun-presentation-minimizer.oxt > /dev/null 2>&1 || :
 
 %preun presentation-minimizer
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared `grep -s 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` > /dev/null 2>&1 || :
 fi
 
 %postun presentation-minimizer
@@ -3403,17 +3405,17 @@ fi
 %pre presenter-screen
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared `grep -s 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` > /dev/null 2>&1 || :
 fi
 
 %post presenter-screen
     # register extension
-    unopkg add --shared --force --link %{baseinstdir}/extensions/presenter-screen.oxt > /dev/null || :
+    unopkg add --shared --force --link %{baseinstdir}/extensions/presenter-screen.oxt > /dev/null 2>&1 || :
 
 %preun presenter-screen
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared `grep -s 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` > /dev/null 2>&1 || :
 fi
 
 %postun presenter-screen
@@ -3428,17 +3430,17 @@ fi
 %pre pdfimport
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared `grep -s 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` > /dev/null 2>&1 || :
 fi
 
 %post pdfimport
     # register extension
-    unopkg add --shared --force --link %{baseinstdir}/extensions/pdfimport.oxt > /dev/null || :
+    unopkg add --shared --force --link %{baseinstdir}/extensions/pdfimport.oxt > /dev/null 2>&1 || :
 
 %preun pdfimport
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared `grep -s 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` > /dev/null 2>&1 || :
 fi
 
 %postun pdfimport
@@ -4018,17 +4020,17 @@ update-desktop-database %{_datadir}/appl
 %pre pyuno
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip || :
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/null 2>&1 || :
 fi
 
 %post pyuno
     # register extension
-    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip > /dev/null || :
+    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip > /dev/null 2>&1 || :
 
 %preun pyuno
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip || :
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/null 2>&1 || :
 fi
 
 %postun pyuno
@@ -4152,6 +4154,9 @@ fi
 %endif
 
 %changelog
+* Thu Nov 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-4.3
+- add openoffice.org-3.2.0.ooo59648.sw.scaling.patch
+
 * Tue Nov 10 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-4.2
 - Resolves: rhbz#533841 ooo#105710 svx loadstorenumbering (caolanm)
 




More information about the fedora-extras-commits mailing list