[libreoffice/f15] update to 3.3.4
David Tardon
dtardon at fedoraproject.org
Fri Nov 25 08:02:11 UTC 2011
commit 5e978d616edfafa613b47a8c048ed846a07d1c3c
Author: David Tardon <dtardon at redhat.com>
Date: Fri Nov 11 12:52:39 2011 +0100
update to 3.3.4
.gitignore | 22 ++
0001-fix-regression-in-SvGlobalName-operator.patch | 39 ---
...p-and-don-t-bail-out-on-mislength-records.patch | 12 +
2011-2713.patch | 242 --------------------
libreoffice.spec | 51 ++---
sources | 52 +++--
6 files changed, 85 insertions(+), 333 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fe1229..6251829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,25 @@
/libreoffice-testing-3.3.3.1.tar.bz2
/libreoffice-ure-3.3.3.1.tar.bz2
/libreoffice-writer-3.3.3.1.tar.bz2
+/libreoffice-artwork-3.3.4.1.tar.bz2
+/libreoffice-base-3.3.4.1.tar.bz2
+/libreoffice-libs-core-3.3.4.1.tar.bz2
+/libreoffice-libs-extern-3.3.4.1.tar.bz2
+/libreoffice-libs-extern-sys-3.3.4.1.tar.bz2
+/libreoffice-libs-gui-3.3.4.1.tar.bz2
+/libreoffice-postprocess-3.3.4.1.tar.bz2
+/libreoffice-sdk-3.3.4.1.tar.bz2
+/libreoffice-testing-3.3.4.1.tar.bz2
+/libreoffice-ure-3.3.4.1.tar.bz2
+/libreoffice-writer-3.3.4.1.tar.bz2
+/libreoffice-l10n-3.3.4.1.tar.bz2
+/libreoffice-bootstrap-3.3.4.1.tar.bz2
+/unowinreg.dll
+/libreoffice-multiliblauncher.sh
+/libreoffice-calc-3.3.4.1.tar.bz2
+/libreoffice-components-3.3.4.1.tar.bz2
+/libreoffice-extensions-3.3.4.1.tar.bz2
+/libreoffice-extras-3.3.4.1.tar.bz2
+/libreoffice-filters-3.3.4.1.tar.bz2
+/libreoffice-help-3.3.4.1.tar.bz2
+/libreoffice-impress-3.3.4.1.tar.bz2
diff --git a/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch b/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
index 42f2f7c..4e50dfa 100644
--- a/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
+++ b/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
@@ -207,3 +207,15 @@ index 81b73e5..daee39b 100644
}
TBCHeader::TBCHeader() : bSignature( 0x3 )
+diff -up libreoffice-3.3.4.1/sw/source/filter/ww8/ww8par2.cxx.dt libreoffice-3.3.4.1/sw/source/filter/ww8/ww8par2.cxx
+--- libreoffice-3.3.4.1/sw/source/filter/ww8/ww8par2.cxx.dt 2011-11-12 11:04:09.612352663 +0100
++++ libreoffice-3.3.4.1/sw/source/filter/ww8/ww8par2.cxx 2011-11-12 11:04:15.324220608 +0100
+@@ -3793,7 +3793,7 @@ void WW8RStyle::ImportSprms(BYTE *pSprms
+ while (const sal_uInt8* pSprm = aSprmIter.GetSprms())
+ {
+ pIo->ImportSprm(pSprm);
+- aSprmIter++;
++ aSprmIter.advance();
+ }
+
+ pParaSprms = 0;
diff --git a/libreoffice.spec b/libreoffice.spec
index d6bddf6..05a4325 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,4 +1,4 @@
-%define libo_version 3.3.3
+%define libo_version 3.3.4
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
# don't worry about whitespace for now
@@ -32,7 +32,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
-Release: 8%{?dist}
+Release: 1%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@@ -154,18 +154,16 @@ Patch62: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
Patch63: 0001-Related-rhbz-711087-band-aid.patch
Patch64: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
Patch65: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
-Patch66: 0001-fix-regression-in-SvGlobalName-operator.patch
-Patch67: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
-Patch68: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
-Patch69: 0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch
-Patch70: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
-Patch71: 0001-Resolves-fdo-39159-don-t-restore-original-view-setti.patch
-Patch72: 0001-catch-exceptions-from-missing-components-here-as-wel.patch
-Patch73: 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
-Patch74: 0001-On-recovery-from-an-autosave-file-use-DefaultFilter-.patch
-Patch75: 0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch
-Patch76: 2011-2713.patch
-Patch77: 0001-let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
+Patch66: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
+Patch67: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
+Patch68: 0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch
+Patch69: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
+Patch70: 0001-Resolves-fdo-39159-don-t-restore-original-view-setti.patch
+Patch71: 0001-catch-exceptions-from-missing-components-here-as-wel.patch
+Patch72: 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
+Patch73: 0001-On-recovery-from-an-autosave-file-use-DefaultFilter-.patch
+Patch74: 0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch
+Patch75: 0001-let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -836,18 +834,16 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch63 -p1 -b .rhbz711087-band-aid.patch
%patch64 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
%patch65 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
-%patch66 -p1 -b .fix-regression-in-SvGlobalName-operator.patch
-%patch67 -p1 -b .rhbz715549-use-fontconfig-s-detected-forma.patch
-%patch68 -p1 -b .rhbz725144-wrong-csh-syntax.patch
-%patch69 -p1 -b .0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch
-%patch70 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch
-%patch71 -p1 -b .fdo39159-don-t-restore-original-view-setti.patch
-%patch72 -p1 -b .catch-exceptions-from-missing-components-here-as-wel.patch
-%patch73 -p1 -b .rhbz738255-avoid-crash-on-NULL-pointer.patch
-%patch74 -p1 -b .On-recovery-from-an-autosave-file-use-DefaultFilter-.patch
-%patch75 -p1 -b .fdo-35513-avoid-crash-while-processing-incor.patch
-%patch76 -p1 -b .2011-2713.patch
-%patch77 -p1 -b .let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
+%patch66 -p1 -b .rhbz715549-use-fontconfig-s-detected-forma.patch
+%patch67 -p1 -b .rhbz725144-wrong-csh-syntax.patch
+%patch68 -p1 -b .0001-This-makefile-is-for-a-standard-Make-so-use-TABs.patch
+%patch69 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch
+%patch70 -p1 -b .fdo39159-don-t-restore-original-view-setti.patch
+%patch71 -p1 -b .catch-exceptions-from-missing-components-here-as-wel.patch
+%patch72 -p1 -b .rhbz738255-avoid-crash-on-NULL-pointer.patch
+%patch73 -p1 -b .On-recovery-from-an-autosave-file-use-DefaultFilter-.patch
+%patch74 -p1 -b .fdo-35513-avoid-crash-while-processing-incor.patch
+%patch75 -p1 -b .let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
@@ -2192,8 +2188,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
-* Fri Oct 21 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-8-UNBUILT
+* Fri Nov 11 2011 David Tardon <dtardon at redhat.com> 1:3.3.4.1-1-UNBUILT
- Resolves: rhbz#747356 let Qt call XInitThreads
+- new upstream version 3.3.4
* Wed Oct 05 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-7
- Resolves: CVE-2011-2713, binary .doc parsing fixes
diff --git a/sources b/sources
index f13ef71..68ced59 100644
--- a/sources
+++ b/sources
@@ -1,30 +1,32 @@
-18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+fab2c812baecc6aeb80a3bd235991eab libreoffice-artwork-3.3.4.1.tar.bz2
+fc6987225645626def9b90109573e5ef libreoffice-base-3.3.4.1.tar.bz2
+a7e302a6dfa5b3472466e4efe3429ef7 libreoffice-libs-core-3.3.4.1.tar.bz2
+0407432b7112bdc6cf757c9f3083a36b libreoffice-libs-extern-3.3.4.1.tar.bz2
+3da668e3013bcf3478b7ab3cd9007d7f libreoffice-libs-extern-sys-3.3.4.1.tar.bz2
+696faf8dd8df19c5580bdbe53d15959a libreoffice-libs-gui-3.3.4.1.tar.bz2
+7dacc39d212baac194934755f44c7eb8 libreoffice-postprocess-3.3.4.1.tar.bz2
+5197fc8cf57cd386cd39691255c6cef8 libreoffice-sdk-3.3.4.1.tar.bz2
+6ae930b1f87e4cb7127b7b43ed5ecd86 libreoffice-testing-3.3.4.1.tar.bz2
+e258766e23a70ee581449460780de395 libreoffice-ure-3.3.4.1.tar.bz2
+af7ac9b934357e5a58cdd203ee305cd3 libreoffice-writer-3.3.4.1.tar.bz2
+22bb8b04202d170bfa5d82932f234c21 libreoffice-l10n-3.3.4.1.tar.bz2
+972be7cfe09d71ea249077c88740d88d libreoffice-bootstrap-3.3.4.1.tar.bz2
+e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
+35c9d670889318e26aad389ed750012f redhat-langpacks.tar.gz
+74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh
+fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+63eaeb89c54e2028b4f9f0e2a4566a02 libreoffice-calc-3.3.4.1.tar.bz2
cf8a6967f7de535ae257fa411c98eb88 cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-35c9d670889318e26aad389ed750012f redhat-langpacks.tar.gz
-37975153511792b5cb081c6dc51403b6 libreoffice-artwork-3.3.3.1.tar.bz2
-d214d394410cf014283f2fe9af06f0b3 libreoffice-base-3.3.3.1.tar.bz2
-3dc213c376826df9d4bd57bcefeeeb84 libreoffice-bootstrap-3.3.3.1.tar.bz2
-8eb5626ffce704dcbe630875ba71f669 libreoffice-calc-3.3.3.1.tar.bz2
-78bf654e9419a96b7a8bf4ef5113a05b libreoffice-components-3.3.3.1.tar.bz2
-cf2a1367eccbc0b7d3e2ee509b2a5888 libreoffice-extensions-3.3.3.1.tar.bz2
-3aa910aad509b01d9b4f0d79e44c10b9 libreoffice-extras-3.3.3.1.tar.bz2
-8a779b1a31fa196f22e32be358266418 libreoffice-filters-3.3.3.1.tar.bz2
-26856760cfaaf9112a5c97548780d9cf libreoffice-help-3.3.3.1.tar.bz2
-4a93d779f02d3e23529876b7336c9cc2 libreoffice-impress-3.3.3.1.tar.bz2
-c37694f438c3830fb72fd1244bac2251 libreoffice-l10n-3.3.3.1.tar.bz2
-13d23cf3c0cedf7ee92d48b14b068805 libreoffice-libs-core-3.3.3.1.tar.bz2
-7406b95239c4260bce6b41c98fd8b3c5 libreoffice-libs-extern-3.3.3.1.tar.bz2
-4ae7dd81c2be9d4a0f9ee95389cd938a libreoffice-libs-extern-sys-3.3.3.1.tar.bz2
-3c02ff760889db642a308924161c1807 libreoffice-libs-gui-3.3.3.1.tar.bz2
-15094ff09fb1f125ef043712bf04c5a8 libreoffice-postprocess-3.3.3.1.tar.bz2
-2483dc1f4ee240b81cd74233a5ac9fb0 libreoffice-sdk-3.3.3.1.tar.bz2
-36a0ca1ceac770de90b2c8fff829e8a0 libreoffice-testing-3.3.3.1.tar.bz2
-c0317cdcbe23f262aa7ad0f9c7566e4a libreoffice-ure-3.3.3.1.tar.bz2
-3baed258ce684ae7cfd56068d94c18e0 libreoffice-writer-3.3.3.1.tar.bz2
+d964eb9442b288510daf8d1c0e14d0ab libreoffice-components-3.3.4.1.tar.bz2
+304f3f9745dad7b4311090bdef3c2b42 libreoffice-extensions-3.3.4.1.tar.bz2
+0eac4ee2ae4bdabb2626f63919d12d7b libreoffice-extras-3.3.4.1.tar.bz2
+66b3bd248655febebd6d1c4015268b42 libreoffice-filters-3.3.4.1.tar.bz2
+67720ee3dd150e6d585a41de7c6ff8c8 libreoffice-help-3.3.4.1.tar.bz2
+df48b0f9be0a7d0448db5fbf5b7b0b9c libreoffice-impress-3.3.4.1.tar.bz2
More information about the scm-commits
mailing list