[libreoffice] update to 3.5.0 rc1

David Tardon dtardon at fedoraproject.org
Thu Jan 19 07:57:18 UTC 2012


commit ccefb282c91cd848700a533e29838143973a05ce
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jan 19 08:57:10 2012 +0100

    update to 3.5.0 rc1

 .gitignore                                         |    4 +
 ..._merge-fix-mis-merge-of-first-module-s-st.patch |   58 -------
 ...-4.7-C-11-these-are-not-string-literal-op.patch |   58 -------
 ...-4.7-C-11-this-is-not-string-literal-oper.patch |   25 ---
 ...-writing-of-strings-from-the-first-module.patch |   85 -----------
 ...ightly-to-avoid-link-problems-with-gcc-4..patch |  159 --------------------
 ...ound-internal-compiler-error-with-gcc-4.7.patch |   41 -----
 libreoffice.spec                                   |   23 ++--
 sources                                            |    8 +-
 9 files changed, 18 insertions(+), 443 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 429a225..ca979ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,7 @@
 /053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
 /libreoffice-help-3.4.99.3.tar.bz2
 /libreoffice-translations-3.4.99.3.tar.bz2
+/libreoffice-core-3.5.0.1.tar.bz2
+/libreoffice-binfilter-3.5.0.1.tar.bz2
+/libreoffice-help-3.5.0.1.tar.bz2
+/libreoffice-translations-3.5.0.1.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index 71c4498..005516b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -31,7 +31,7 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        3.4.99.3
+Version:        3.5.0.1
 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
@@ -116,12 +116,6 @@ Patch10: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch
 Patch11: libreoffice-gcj.patch
 Patch12: libreoffice-rhel6poppler.patch
 %endif
-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
 
@@ -780,12 +774,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch11 -p1 -b .gcj.patch
 %patch12 -p0 -b .rhel6poppler.patch
 %endif
-%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
@@ -2067,6 +2055,15 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Jan 19 2012 David Tardon <dtardon at redhat.com> - 3.5.0.1-1
+- 3.5.0 rc1
+- drop integrated 0001-workaround-internal-compiler-error-with-gcc-4.7.patch
+- drop integrated 0001-fix-for-gcc-4.7-C-11-these-are-not-string-literal-op.patch
+- drop integrated 0001-fix-for-gcc-4.7-C-11-this-is-not-string-literal-oper.patch
+- drop integrated 0001-Revert-fast_merge-fix-mis-merge-of-first-module-s-st.patch
+- drop integrated 0001-fix-writing-of-strings-from-the-first-module.patch
+- drop integrated 0001-refactor-slightly-to-avoid-link-problems-with-gcc-4..patch
+
 * 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
diff --git a/sources b/sources
index 0e407d0..6fa27de 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-ea6a0e5675a7634c07417b9419b369e6  libreoffice-core-3.4.99.3.tar.bz2
-5da48ca6516c92c6d724daa310dfa082  libreoffice-binfilter-3.4.99.3.tar.bz2
+266197710cd2348b7dfe5731f9782bf9  libreoffice-core-3.5.0.1.tar.bz2
+bbf426cf125307cff9bdd1219b14f450  libreoffice-binfilter-3.5.0.1.tar.bz2
 798b2ffdc8bcfe7bca2cf92b62caf685  798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 35c94d2df8893241173de1d16b6034c0  35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 ada24d37d8d638b3d8a9985e80bc2978  ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -7,10 +7,10 @@ ada24d37d8d638b3d8a9985e80bc2978  ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.
 17410483b5b5f267aa18b7e00b65e6e0  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 b4cae0700aa1c2aef7eb7f345365e6f1  b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 053a35c244bf132f806e198ac4d960aa  053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
-6bf0a6906991a83ad9f2595c65e7d9e7  libreoffice-help-3.4.99.3.tar.bz2
+f22e421b0117b09f27c709ea7322450d  libreoffice-help-3.5.0.1.tar.bz2
 e1c178b18f130b40494561f02bc1a948  e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
 7c2549f6b0a8bb604e6c4c729ffdcfe6  7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-d1567168e1b6300bbd97c00f1fae699d  libreoffice-translations-3.4.99.3.tar.bz2
+4730edbc9e7730aa65127108c40f5c35  libreoffice-translations-3.5.0.1.tar.bz2
 185d60944ea767075d27247c3162b3bc  185d60944ea767075d27247c3162b3bc-unowinreg.dll
 c1b5b8d1dd929a1261a6f8872d92b799  redhat-langpacks.tar.gz
 74939c9ea525374776f09bf972ede99f  libreoffice-multiliblauncher.sh


More information about the scm-commits mailing list