From 552dae6f0579576b6fc8082bcb7944d83bdf6552 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Jan 25 2012 05:40:36 +0000
Subject: update to 3.5.0 rc2


---

diff --git a/.gitignore b/.gitignore
index cd45e0f..a15fe0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,8 @@
 /libreoffice-help-3.5.0.1.tar.bz2
 /libreoffice-translations-3.5.0.1.tar.bz2
 /adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2
+/libreoffice-core-3.5.0.2.tar.xz
+/libreoffice-binfilter-3.5.0.2.tar.xz
+/776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
+/libreoffice-help-3.5.0.2.tar.xz
+/libreoffice-translations-3.5.0.2.tar.xz
diff --git a/libreoffice.spec b/libreoffice.spec
index 2df684c..cc1dac2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -31,17 +31,17 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        3.5.0.1
+Version:        3.5.0.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
 URL:            http://www.documentfoundation.org/develop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        %{source_url}/libreoffice-core-%{version}.tar.bz2
-Source1:        %{source_url}/libreoffice-binfilter-%{version}.tar.bz2
-Source2:        %{source_url}/libreoffice-help-%{version}.tar.bz2
-Source3:        %{source_url}/libreoffice-translations-%{version}.tar.bz2
+Source0:        %{source_url}/libreoffice-core-%{version}.tar.xz
+Source1:        %{source_url}/libreoffice-binfilter-%{version}.tar.xz
+Source2:        %{source_url}/libreoffice-help-%{version}.tar.xz
+Source3:        %{source_url}/libreoffice-translations-%{version}.tar.xz
 Source4:        http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 Source5:        redhat-langpacks.tar.gz
 Source6:        libreoffice-multiliblauncher.sh
@@ -63,7 +63,7 @@ Source17:       http://hg.services.openoffice.org/binaries/067201ea8b126597670b5
 %endif
 Source18:       http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 %endif
-Source19:       http://dev-www.libreoffice.org/src/adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2
+Source19:       http://dev-www.libreoffice.org/src/776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.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
 
@@ -825,8 +825,7 @@ export CXXFLAGS=$ARCH_FLAGS
 %endif
 
 autoconf
-# TODO: review the options
-# TODO: --with-poor-help-localizations is gone, IIRC
+# TODO: disable postgresql sdbc driver for now. Stephan to take a stab at it
 %configure \
  %vendoroption --with-num-cpus=$NBUILDS --with-max-jobs=$NDMAKES \
  --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
@@ -847,6 +846,7 @@ autoconf
  --with-external-tar=`pwd`/ext_sources --with-java-target-version=1.5 \
  --without-system-libcmis --without-system-libvisio \
  --without-system-sampleicc \
+ --disable-postgresql-sdbc \
  %{distrooptions}
 
 mkdir -p ext_sources
@@ -2056,6 +2056,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Jan 25 2012 David Tardon <dtardon@redhat.com> - 3.5.0.2-1
+- 3.5.0 rc2
+
 * Thu Jan 19 2012 David Tardon <dtardon@redhat.com> - 3.5.0.1-1
 - 3.5.0 rc1
 - drop integrated 0001-workaround-internal-compiler-error-with-gcc-4.7.patch
diff --git a/sources b/sources
index ba1f2ac..16910ee 100644
--- a/sources
+++ b/sources
@@ -1,16 +1,16 @@
-266197710cd2348b7dfe5731f9782bf9  libreoffice-core-3.5.0.1.tar.bz2
-bbf426cf125307cff9bdd1219b14f450  libreoffice-binfilter-3.5.0.1.tar.bz2
+31d235dbab027c365cd48644f990af22  libreoffice-core-3.5.0.2.tar.xz
+acd3d9b4e34eb1a576dc79f105975f9a  libreoffice-binfilter-3.5.0.2.tar.xz
 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
-adb5c5c8398fd89ebee2d9b4e90e061e  adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2
-f22e421b0117b09f27c709ea7322450d  libreoffice-help-3.5.0.1.tar.bz2
+776ad69a63ac1e99abed176e54ce25d9  776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
+4410896eb12afc18e8ab4d6f8da1a14b  libreoffice-help-3.5.0.2.tar.xz
 e1c178b18f130b40494561f02bc1a948  e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
 7c2549f6b0a8bb604e6c4c729ffdcfe6  7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-4730edbc9e7730aa65127108c40f5c35  libreoffice-translations-3.5.0.1.tar.bz2
+ae084502eb579d67a10bf6a7091fdd44  libreoffice-translations-3.5.0.2.tar.xz
 185d60944ea767075d27247c3162b3bc  185d60944ea767075d27247c3162b3bc-unowinreg.dll
 c1b5b8d1dd929a1261a6f8872d92b799  redhat-langpacks.tar.gz
 74939c9ea525374776f09bf972ede99f  libreoffice-multiliblauncher.sh