3.5.0 beta1

.gitignore

@@ -41,3 +41,7 @@
 /libreoffice-translations-3.5.0.0.tar.bz2
 /libreoffice-multiliblauncher.sh
 /8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
+/libreoffice-core-3.4.99.1.tar.bz2
+/libreoffice-binfilter-3.4.99.1.tar.bz2
+/libreoffice-help-3.4.99.1.tar.bz2
+/libreoffice-translations-3.4.99.1.tar.bz2

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);

libreoffice.spec

@@ -27,7 +27,7 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        3.5.0.0
+Version:        3.4.99.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
@@ -56,7 +56,7 @@ Source15:       http://dev-www.libreoffice.org/extern/b4cae0700aa1c2aef7eb7f3453
 Source16:       http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 Source17:       http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 %endif
-Source18:       http://dev-www.libreoffice.org/src/8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
+Source18:       http://dev-www.libreoffice.org/src/a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
 Source19:       http://dev-www.libreoffice.org/src/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
 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?
@@ -112,7 +112,6 @@ Patch12: libreoffice-rhel6poppler.patch
 %endif
 # TODO: this in S390 only, so it can wait .-)
 #Patch13: solenv.fix.mk.inheritance.patch
-Patch14: skip-stuck-test.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -772,7 +771,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch12 -p0 -b .rhel6poppler.patch
 %endif
 #%patch13 -p1 -b .solenv.fix.mk.inheritance.patch
-%patch14 -p1 -b .skip-stuck-test.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2056,8 +2054,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Fri Dec 09 2011 David Tardon <dtardon@redhat.com> - 3.5.0.0-1
+* Tue Dec 13 2011 David Tardon <dtardon@redhat.com> - 3.4.99.1-1
-- first attempt at 3.5
+- 3.5.0 beta1
 - drop integrated 0001-Related-fdo-37195-migrationoo3-not-registered.patch
 - drop integrated 0001-Related-i58612-don-t-crash-anyway.patch
 - drop integrated 0001-Related-rhbz-652604-better-survive-exceptions-thrown.patch

skip-stuck-test.patch

@@ -1,11 +0,0 @@
-diff -up libreoffice-3.5.0.0/sd/Module_sd.mk.dt libreoffice-3.5.0.0/sd/Module_sd.mk
---- libreoffice-3.5.0.0/sd/Module_sd.mk.dt	2011-12-09 07:07:39.324405990 +0100
-+++ libreoffice-3.5.0.0/sd/Module_sd.mk	2011-12-09 07:08:16.400488687 +0100
-@@ -43,7 +43,6 @@ $(eval $(call gb_Module_add_targets,sd,\
- ifneq ($(OS),DRAGONFLY)
- $(eval $(call gb_Module_add_check_targets,sd,\
-     CppunitTest_sd_uimpress \
--    CppunitTest_sd_filters_test \
- ))
- endif
- 

sources

@@ -1,17 +1,17 @@
-bf6ce92d8d69f1dec4836a7249e10436  libreoffice-core-3.5.0.0.tar.bz2
+cbd39b7a741c1b6bfa9ca153496c3d13  libreoffice-core-3.4.99.1.tar.bz2
-346304e8699ca8d8d642072bff79909d  libreoffice-binfilter-3.5.0.0.tar.bz2
+1fbefad872975a71837da4b3ebbcf31c  libreoffice-binfilter-3.4.99.1.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
-8f107ffb3fc9d9b920b7bbd0bc79c7e8  8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
+a8b25a0bf696fd126a08319d88998492  a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
 e1c178b18f130b40494561f02bc1a948  e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-a0b19441245d7627c299d7014d110b32  libreoffice-help-3.5.0.0.tar.bz2
+379ddf3008e76f338e0973adc375340d  libreoffice-help-3.4.99.1.tar.bz2
 7c2549f6b0a8bb604e6c4c729ffdcfe6  7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 0981bda6548a8c8233ffce2b6e4b2a23  0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
-b9dee0572120c87906ed6e2fb4696b69  libreoffice-translations-3.5.0.0.tar.bz2
+f08b4a6ec456e8c4f1e06acf51d1def4  libreoffice-translations-3.4.99.1.tar.bz2
 185d60944ea767075d27247c3162b3bc  185d60944ea767075d27247c3162b3bc-unowinreg.dll
 c1b5b8d1dd929a1261a6f8872d92b799  redhat-langpacks.tar.gz
 74939c9ea525374776f09bf972ede99f  libreoffice-multiliblauncher.sh