[openoffice.org/f14/master] drop integrated patch

Caolan McNamara caolanm at fedoraproject.org
Wed Oct 13 09:13:13 UTC 2010


commit d0f6202765a126f716aaa5374d3076a31d6ca7ed
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 13 10:13:19 2010 +0100

    drop integrated patch

 ...g-3.3.0.ooo114703.vcl.betterlocalize.font.patch |   30 --------------------
 openoffice.org.spec                                |   19 ++++++------
 2 files changed, 9 insertions(+), 40 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 4d4fcdc..4d856cc 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -124,11 +124,10 @@ Patch38: openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
 Patch39: workspace.cmcfixes78.patch
 Patch40: openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
 Patch41: workspace.cmcfixes79.patch
-Patch42: openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
-Patch43: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
-Patch44: openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
-Patch45: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
-Patch46: LibO-backport-eapifix.patch
+Patch42: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
+Patch43: openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
+Patch44: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
+Patch45: LibO-backport-eapifix.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1658,11 +1657,10 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch39 -p1 -b .workspace.cmcfixes78.patch
 %patch40 -p0 -b .ooo114012.sd.bada11ychain.patch
 %patch41 -p1 -b .workspace.cmcfixes79.patch
-%patch42 -p1 -b .ooo114703.vcl.betterlocalize.font.patch
-%patch43 -p0 -b .rh637738.libgcrypt.addmutex.patch
-%patch44 -p1 -b .rh638185.editeng.cjkctlhtmlsizes.patch
-%patch45 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
-%patch46 -p1 -b .LibO-backport-eapifix.patch
+%patch42 -p0 -b .rh637738.libgcrypt.addmutex.patch
+%patch43 -p1 -b .rh638185.editeng.cjkctlhtmlsizes.patch
+%patch44 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
+%patch45 -p1 -b .LibO-backport-eapifix.patch
 rm -rf l10n/source/kid  # rhbz#639212
 
 %build
@@ -3864,6 +3862,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %changelog
 * Wed Oct 13 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-10.1
 - latest milestone
+- drop integrated openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
 
 * Fri Oct 08 2010 Dan Horák <dan[at]danny.cz>- 1:3.3.0-9.5
 - don't build langpacks on s390(x) to workaround the limited diskspace


More information about the scm-commits mailing list