[openoffice.org/f14/master] drop integrated patch
Caolan McNamara
caolanm at fedoraproject.org
Fri Nov 26 21:11:46 UTC 2010
commit eab38ef5568cdc5490aa950e076a784ce3d23a89
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 21:11:43 2010 +0000
drop integrated patch
...bz-647392-Ensure-autocorrect-doesn-t-cras.patch | 25 --------------
openoffice.org.spec | 35 +++++++++----------
2 files changed, 17 insertions(+), 43 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 0ae6b97..2104a5f 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -135,15 +135,14 @@ Patch51: 0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
Patch52: 0001-abort-doesn-t-gain-us-anything-here.patch
Patch53: 0001-rhbz-649824-this-key-name-is-wrong.patch
Patch54: turn-script-providers-into-extensions.patch
-Patch55: 0001-Resolves-rhbz-647392-Ensure-autocorrect-doesn-t-cras.patch
-Patch56: 0001-Resolves-rhbz-654203-crash-after-unhandled-exception.patch
-Patch57: qstart.dont-forceenabled-on-post-reg-restart.patch
-Patch58: rhbz650170.quickstarter.safeexit.patch
-Patch59: 0001-initial-commit-for-vba-blob-not-including-container_.patch
-Patch60: 0001-we-see-stacktraces-with-this-NULL-sometimes.patch
-Patch61: exit.quickstarter.when.deleted.patch
-Patch62: 0001-Resolves-rhbz-656191-Catch-bad-alloc-and-convert-to-.patch
-Patch63: 0001-destroydesktop.in.timeout.patch
+Patch55: 0001-Resolves-rhbz-654203-crash-after-unhandled-exception.patch
+Patch56: qstart.dont-forceenabled-on-post-reg-restart.patch
+Patch57: rhbz650170.quickstarter.safeexit.patch
+Patch58: 0001-initial-commit-for-vba-blob-not-including-container_.patch
+Patch59: 0001-we-see-stacktraces-with-this-NULL-sometimes.patch
+Patch60: exit.quickstarter.when.deleted.patch
+Patch61: 0001-Resolves-rhbz-656191-Catch-bad-alloc-and-convert-to-.patch
+Patch62: 0001-destroydesktop.in.timeout.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1695,15 +1694,14 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
%patch52 -p1 -b .abort-doesn-t-gain-us-anything-here.patch
%patch53 -p1 -b .rhbz-649824-this-key-name-is-wrong.patch
%patch54 -p1 -b .turn-script-providers-into-extensions.patch
-%patch55 -p1 -b .rhbz-647392-Ensure-autocorrect-doesn-t-cras.patch
-%patch56 -p1 -b .rhbz-654203-crash-after-unhandled-exception.patch
-%patch57 -p1 -b .qstart.dont-forceenabled-on-post-reg-restart.patch
-%patch58 -p1 -b .rhbz650170.quickstarter.safeexit.patch
-%patch59 -p1 -b .vba-blob-not-including-container_.patch
-%patch60 -p1 -b .0001-we-see-stacktraces-with-this-NULL-sometimes.patch
-%patch61 -p1 -b .exit.quickstarter.when.deleted.patch
-%patch62 -p1 -b .rhbz656191-Catch-bad-alloc-and-convert-to-.patch
-%patch63 -p1 -b .0001-destroydesktop.in.timeout.patch
+%patch55 -p1 -b .rhbz-654203-crash-after-unhandled-exception.patch
+%patch56 -p1 -b .qstart.dont-forceenabled-on-post-reg-restart.patch
+%patch57 -p1 -b .rhbz650170.quickstarter.safeexit.patch
+%patch58 -p1 -b .vba-blob-not-including-container_.patch
+%patch59 -p1 -b .0001-we-see-stacktraces-with-this-NULL-sometimes.patch
+%patch60 -p1 -b .exit.quickstarter.when.deleted.patch
+%patch61 -p1 -b .rhbz656191-Catch-bad-alloc-and-convert-to-.patch
+%patch22 -p1 -b .0001-destroydesktop.in.timeout.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip
@@ -3902,6 +3900,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
- latest milestone
- Resolves: rhbz#656191 catch bad_alloc when opening corrupt zips
- Resolves: rhbz#652695 release desktop in timeout
+- drop integrated 0001-Resolves-rhbz-647392-Ensure-autocorrect-doesn-t-cras.patch
* Thu Nov 25 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-16.4
- Resolves: rhbz#610103 exit quickstarter when libs deleted
More information about the scm-commits
mailing list