[libreoffice] 3.5.0 beta3
David Tardon
dtardon at fedoraproject.org
Fri Jan 13 08:22:17 UTC 2012
commit 23a17657a4a03dbff6498c758aee58271bda16e4
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jan 13 09:17:31 2012 +0100
3.5.0 beta3
.gitignore | 5 +
0001-fix-syntactic-error.patch | 85 --
0001-gcc-trunk-avoid-confusion.patch | 26 -
...ix-error-unable-to-find-string-literal-op.patch | 1084 --------------------
0001-smath-does-not-handle-accents-in-MathML.patch | 72 --
...for-LO-namespace-pollution-breaking-KDE4-.patch | 40 -
libreoffice.spec | 48 +-
sources | 13 +-
8 files changed, 33 insertions(+), 1340 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c28212..429a225 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,8 @@
/libreoffice-binfilter-3.4.99.2.tar.bz2
/libreoffice-help-3.4.99.2.tar.bz2
/libreoffice-translations-3.4.99.2.tar.bz2
+/libreoffice-core-3.4.99.3.tar.bz2
+/libreoffice-binfilter-3.4.99.3.tar.bz2
+/053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
+/libreoffice-help-3.4.99.3.tar.bz2
+/libreoffice-translations-3.4.99.3.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index 4d78e83..9d7dea3 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -31,8 +31,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: 3.4.99.2
-Release: 3%{?dist}
+Version: 3.4.99.3
+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
@@ -61,7 +61,7 @@ Source16: http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac
Source17: http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
Source18: http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
%endif
-Source19: http://dev-www.libreoffice.org/src/a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
+Source19: http://dev-www.libreoffice.org/src/053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
Source20: http://dev-www.libreoffice.org/src/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
Source21: http://dev-www.libreoffice.org/src/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
@@ -114,17 +114,12 @@ Patch10: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch
Patch11: libreoffice-gcj.patch
Patch12: libreoffice-rhel6poppler.patch
%endif
-Patch13: 0001-fix-syntactic-error.patch
-Patch14: 0001-gcc-trunk-fix-error-unable-to-find-string-literal-op.patch
-Patch15: 0001-gcc-trunk-avoid-confusion.patch
-Patch16: 0001-workaround-for-LO-namespace-pollution-breaking-KDE4-.patch
-Patch17: 0001-smath-does-not-handle-accents-in-MathML.patch
-Patch18: 0001-workaround-internal-compiler-error-with-gcc-4.7.patch
-Patch19: 0001-fix-for-gcc-4.7-C-11-these-are-not-string-literal-op.patch
-Patch20: 0001-fix-for-gcc-4.7-C-11-this-is-not-string-literal-oper.patch
-Patch21: 0001-Revert-fast_merge-fix-mis-merge-of-first-module-s-st.patch
-Patch22: 0001-fix-writing-of-strings-from-the-first-module.patch
-Patch23: 0001-refactor-slightly-to-avoid-link-problems-with-gcc-4..patch
+Patch13: 0001-workaround-internal-compiler-error-with-gcc-4.7.patch
+Patch14: 0001-fix-for-gcc-4.7-C-11-these-are-not-string-literal-op.patch
+Patch15: 0001-fix-for-gcc-4.7-C-11-this-is-not-string-literal-oper.patch
+Patch16: 0001-Revert-fast_merge-fix-mis-merge-of-first-module-s-st.patch
+Patch17: 0001-fix-writing-of-strings-from-the-first-module.patch
+Patch18: 0001-refactor-slightly-to-avoid-link-problems-with-gcc-4..patch
# TODO: this in S390 only, so it can wait .-)
#Patch13: solenv.fix.mk.inheritance.patch
@@ -783,17 +778,12 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch11 -p1 -b .gcj.patch
%patch12 -p0 -b .rhel6poppler.patch
%endif
-%patch13 -p1 -b .fix-syntactic-error.patch
-%patch14 -p1 -b .gcc-trunk-fix-error-unable-to-find-string-literal-op.patch
-%patch15 -p1 -b .gcc-trunk-avoid-confusion.patch
-%patch16 -p1 -b .workaround-for-LO-namespace-pollution-breaking-KDE4-.patch
-%patch17 -p1 -b .smath-does-not-handle-accents-in-MathML.patch
-%patch18 -p1 -b .workaround-internal-compiler-error-with-gcc-4.7.patch
-%patch19 -p1 -b .fix-for-gcc-4.7-C-11-these-are-not-string-literal-op.patch
-%patch20 -p1 -b .fix-for-gcc-4.7-C-11-this-is-not-string-literal-oper.patch
-%patch21 -p1 -b .Revert-fast_merge-fix-mis-merge-of-first-module-s-st.patch
-%patch22 -p1 -b .fix-writing-of-strings-from-the-first-module.patch
-%patch23 -p1 -b .refactor-slightly-to-avoid-link-problems-with-gcc-4..patch
+%patch13 -p1 -b .workaround-internal-compiler-error-with-gcc-4.7.patch
+%patch14 -p1 -b .fix-for-gcc-4.7-C-11-these-are-not-string-literal-op.patch
+%patch15 -p1 -b .fix-for-gcc-4.7-C-11-this-is-not-string-literal-oper.patch
+%patch16 -p1 -b .Revert-fast_merge-fix-mis-merge-of-first-module-s-st.patch
+%patch17 -p1 -b .fix-writing-of-strings-from-the-first-module.patch
+%patch18 -p1 -b .refactor-slightly-to-avoid-link-problems-with-gcc-4..patch
#%patch13 -p1 -b .solenv.fix.mk.inheritance.patch
# TODO: check this
@@ -2070,7 +2060,13 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
-* Fri Jan 06 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.99.2-3
+* Fri Jan 13 2012 David Tardon <dtardon at redhat.com> - 3.4.99.3-1
+- 3.5.0 beta3
+- drop integrated 0001-fix-syntactic-error.patch
+- drop integrated 0001-gcc-trunk-fix-error-unable-to-find-string-literal-op.patch
+- drop integrated 0001-gcc-trunk-avoid-confusion.patch
+- drop integrated 0001-workaround-for-LO-namespace-pollution-breaking-KDE4-.patch
+- drop integrated 0001-smath-does-not-handle-accents-in-MathML.patch
- Resolves: rhbz#533318 smath does not handle accents in MathML
- Resolves: rhbz#771108 English menu in writer despite installation of
libreoffice-langpack-de
diff --git a/sources b/sources
index 0e94de2..350785e 100644
--- a/sources
+++ b/sources
@@ -1,19 +1,18 @@
-ad6dd1d1eb6f76472ba0031f02ce8b9f libreoffice-core-3.4.99.2.tar.bz2
-a06ce4cab2216eef4c92d5550f318203 libreoffice-binfilter-3.4.99.2.tar.bz2
+ea6a0e5675a7634c07417b9419b369e6 libreoffice-core-3.4.99.3.tar.bz2
+5da48ca6516c92c6d724daa310dfa082 libreoffice-binfilter-3.4.99.3.tar.bz2
798b2ffdc8bcfe7bca2cf92b62caf685 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-a8b25a0bf696fd126a08319d88998492 a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
+053a35c244bf132f806e198ac4d960aa 053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
+6bf0a6906991a83ad9f2595c65e7d9e7 libreoffice-help-3.4.99.3.tar.bz2
e1c178b18f130b40494561f02bc1a948 e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-a4c0300d0b272b43d0a488676d5022f2 libreoffice-help-3.4.99.2.tar.bz2
7c2549f6b0a8bb604e6c4c729ffdcfe6 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-0981bda6548a8c8233ffce2b6e4b2a23 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
-13f3cdee1c8a5a471e8240821a94b4b9 libreoffice-translations-3.4.99.2.tar.bz2
+d1567168e1b6300bbd97c00f1fae699d libreoffice-translations-3.4.99.3.tar.bz2
185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll
-c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz
+03c019658ec49050c8103ba0f10b5067 redhat-langpacks.tar.gz
74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh
fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
More information about the scm-commits
mailing list