[libreoffice] 3.5.0 beta2
David Tardon
dtardon at fedoraproject.org
Thu Dec 22 15:24:48 UTC 2011
commit 02742a4ed0a0a4e420824530287dfca6949d1f1f
Author: David Tardon <dtardon at redhat.com>
Date: Wed Dec 21 18:42:06 2011 +0100
3.5.0 beta2
.gitignore | 4 +
0001-Fix-typo-and-clean-up.patch | 52 ---
...es-rhbz-761009-IFSD_Equal-is-asymmetrical.patch | 30 --
...bz-767708-avoid-SIGBUS-writing-to-overcom.patch | 41 --
0001-force-gbuild-stage-for-CustomTargets.patch | 28 --
...lations-do-already-exist-in-translations-.patch | 403 --------------------
libreoffice-installfix.patch | 2 +-
libreoffice.spec | 29 +-
sources | 9 +-
9 files changed, 22 insertions(+), 576 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 77742b9..1c28212 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,7 @@
/libreoffice-help-3.4.99.1.tar.bz2
/libreoffice-translations-3.4.99.1.tar.bz2
/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
+/libreoffice-core-3.4.99.2.tar.bz2
+/libreoffice-binfilter-3.4.99.2.tar.bz2
+/libreoffice-help-3.4.99.2.tar.bz2
+/libreoffice-translations-3.4.99.2.tar.bz2
diff --git a/libreoffice-installfix.patch b/libreoffice-installfix.patch
index 367e7bf..3b99656 100644
--- a/libreoffice-installfix.patch
+++ b/libreoffice-installfix.patch
@@ -1,7 +1,7 @@
--- a/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:38.000000000 +0000
+++ b/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:42.000000000 +0000
@@ -403,7 +403,6 @@
-
+ {
$installdir = installer::systemactions::create_directories("install", $languageref);
installer::logger::print_message( "... creating installation set in $installdir ...\n" );
- remove_old_installation_sets($installdir);
diff --git a/libreoffice.spec b/libreoffice.spec
index fc1ee84..d6dd14a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,7 +27,7 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: 3.4.99.1
+Version: 3.4.99.2
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
@@ -61,7 +61,6 @@ Source19: http://dev-www.libreoffice.org/src/e1c178b18f130b40494561f02bc1a
Source20: http://dev-www.libreoffice.org/src/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
# TODO: IIRC mysql-connector-cpp is in Fedora. Is it usable?
Source21: http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
-Source22: http://dev-www.libreoffice.org/src/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
BuildRequires: binutils, java-devel < 1:1.7.0, boost-devel, zlib-devel
@@ -111,12 +110,7 @@ Patch10: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch
Patch11: libreoffice-gcj.patch
Patch12: libreoffice-rhel6poppler.patch
%endif
-Patch13: 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
-Patch14: 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
-Patch15: 0001-force-gbuild-stage-for-CustomTargets.patch
-Patch16: 0001-these-translations-do-already-exist-in-translations-.patch
-Patch17: 0001-fix-syntactic-error.patch
-Patch18: 0001-Fix-typo-and-clean-up.patch
+Patch13: 0001-fix-syntactic-error.patch
# TODO: this in S390 only, so it can wait .-)
#Patch13: solenv.fix.mk.inheritance.patch
@@ -738,6 +732,7 @@ Rules for auto-correcting common %{langname} typing errors. \
%prep
%setup -q -c -a 1 -a 2 -a 3
+rm -rf git-hooks */git-hooks
for a in */*; do mv `pwd`/$a .; done
#Customize Palette to remove Sun colours and add Red Hat colours
(head -n -1 extras/source/palettes/standard.soc && \
@@ -762,12 +757,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch11 -p1 -b .gcj.patch
%patch12 -p0 -b .rhel6poppler.patch
%endif
-%patch13 -p1 -b .rhbz761009-IFSD_Equal-is-asymmetrical.patch
-%patch14 -p1 -b .rhbz767708-avoid-SIGBUS-writing-to-overcom.patch
-%patch15 -p1 -b .force-gbuild-stage-for-CustomTargets.patch
-%patch16 -p1 -b .these-translations-do-already-exist-in-translations-.patch
-%patch17 -p1 -b .fix-syntactic-error.patch
-%patch18 -p1 -b .Fix-typo-and-clean-up.patch
+%patch13 -p1 -b .fix-syntactic-error.patch
#%patch13 -p1 -b .solenv.fix.mk.inheritance.patch
# TODO: check this
@@ -860,7 +850,6 @@ cp %{SOURCE18} ext_sources
cp %{SOURCE19} ext_sources
cp %{SOURCE20} ext_sources
cp %{SOURCE21} ext_sources
-cp %{SOURCE22} ext_sources
touch src.downloaded
. ./Env.Host.sh
@@ -1408,6 +1397,7 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/libitglo.so
%{baseinstdir}/program/libitilo.so
%{baseinstdir}/program/libofficebeanlo.so
+%{baseinstdir}/program/liboooimprovecorelo.so
%{baseinstdir}/program/libfilelo.so
%{baseinstdir}/program/libfilterconfiglo.so
%{baseinstdir}/program/libflatlo.so
@@ -1959,7 +1949,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%defattr(-,root,root,-)
%dir %{baseinstdir}
%dir %{baseinstdir}/program
-%{baseinstdir}/program/libcdrimportlo.so
%{baseinstdir}/program/libflashlo.so
%{baseinstdir}/program/libsvgfilterlo.so
%{baseinstdir}/program/libvisioimportlo.so
@@ -2044,6 +2033,14 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Wed Dec 21 2011 David Tardon <dtardon at redhat.com> - 3.4.99.2-1
+- 3.5.0 beta2
+- drop integrated 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
+- drop integrated 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
+- drop integrated 0001-force-gbuild-stage-for-CustomTargets.patch
+- drop integrated 0001-these-translations-do-already-exist-in-translations-.patch
+- drop integrated 0001-Fix-typo-and-clean-up.patch
+
* Sun Dec 18 2011 David Tardon <dtardon at redhat.com> - 3.4.99.1-1
- 3.5.0 beta1
- drop integrated 0001-Related-fdo-37195-migrationoo3-not-registered.patch
diff --git a/sources b/sources
index 5136f5c..0e94de2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-cbd39b7a741c1b6bfa9ca153496c3d13 libreoffice-core-3.4.99.1.tar.bz2
-1fbefad872975a71837da4b3ebbcf31c libreoffice-binfilter-3.4.99.1.tar.bz2
+ad6dd1d1eb6f76472ba0031f02ce8b9f libreoffice-core-3.4.99.2.tar.bz2
+a06ce4cab2216eef4c92d5550f318203 libreoffice-binfilter-3.4.99.2.tar.bz2
798b2ffdc8bcfe7bca2cf92b62caf685 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -8,11 +8,10 @@ ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.
b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
a8b25a0bf696fd126a08319d88998492 a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
e1c178b18f130b40494561f02bc1a948 e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-379ddf3008e76f338e0973adc375340d libreoffice-help-3.4.99.1.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
-cc8eb870d6a324d36575420efd856319 cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
-f08b4a6ec456e8c4f1e06acf51d1def4 libreoffice-translations-3.4.99.1.tar.bz2
+13f3cdee1c8a5a471e8240821a94b4b9 libreoffice-translations-3.4.99.2.tar.bz2
185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll
c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz
74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh
More information about the scm-commits
mailing list