[libreoffice/master-3.5: 11/11] Merge branch 'master' into master-3.5

[David Tardon]

commit d9b40f26d4d784365cee9421f3d6e3656c3c74a2
Merge: 21da76a da07b31
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 11 18:21:38 2011 +0100

    Merge branch 'master' into master-3.5

 libreoffice.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc libreoffice.spec
index 99ff152,e27a7bf..cf299ca
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@@ -33,37 -32,46 +33,37 @@@ License:        LGPLv3 and LGPLv2+ and 
  Group:          Applications/Productivity
  URL:            http://www.documentfoundation.org/develop
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 -Source0:        %{source_url}/libreoffice-artwork-%{version}.tar.bz2
 -Source1:        %{source_url}/libreoffice-base-%{version}.tar.bz2
 -Source2:        %{source_url}/libreoffice-bootstrap-%{version}.tar.bz2
 -Source3:        %{source_url}/libreoffice-calc-%{version}.tar.bz2
 -Source4:        %{source_url}/libreoffice-components-%{version}.tar.bz2
 -Source5:        %{source_url}/libreoffice-extensions-%{version}.tar.bz2
 -Source6:        %{source_url}/libreoffice-extras-%{version}.tar.bz2
 -Source7:        %{source_url}/libreoffice-filters-%{version}.tar.bz2
 -Source8:        %{source_url}/libreoffice-help-%{version}.tar.bz2
 -Source9:        %{source_url}/libreoffice-impress-%{version}.tar.bz2
 -Source10:       %{source_url}/libreoffice-libs-core-%{version}.tar.bz2
 -Source11:       %{source_url}/libreoffice-libs-extern-%{version}.tar.bz2
 -Source12:       %{source_url}/libreoffice-libs-extern-sys-%{version}.tar.bz2
 -Source13:       %{source_url}/libreoffice-libs-gui-%{version}.tar.bz2
 -Source14:       %{source_url}/libreoffice-postprocess-%{version}.tar.bz2
 -Source15:       %{source_url}/libreoffice-sdk-%{version}.tar.bz2
 -Source16:       %{source_url}/libreoffice-testing-%{version}.tar.bz2
 -Source17:       %{source_url}/libreoffice-ure-%{version}.tar.bz2
 -Source18:       %{source_url}/libreoffice-writer-%{version}.tar.bz2
 -Source19:       %{source_url}/libreoffice-translations-%{version}.tar.bz2
 -Source20:       http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 -Source21:       redhat-langpacks.tar.gz
 -Source22:       libreoffice-multiliblauncher.sh
 -Source23:       http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 -Source24:       http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 -Source25:       http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 -Source26:       http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 -Source27:       http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 -Source28:       http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 -Source29:       http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 
 +
 +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
 +Source4:        http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 +Source5:        redhat-langpacks.tar.gz
 +Source6:        libreoffice-multiliblauncher.sh
 +Source7:        http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 +Source8:        http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 +Source9:        http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 +Source10:       http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 +Source11:       http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 +Source12:       http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 +Source13:       http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 
  #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose
  #backwards compatability.
 -Source30:       http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 -Source31:       http://dev-www.libreoffice.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 +Source14:       http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 +Source15:       http://dev-www.libreoffice.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
  %if %{defined rhel} && 0%{?rhel} < 7
 -Source32:       http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 -Source33:       http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 +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
 +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?
 +Source21:       http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 +
  BuildRequires:  zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
- BuildRequires:  binutils, java-devel < 1.7.0, boost-devel, zlib-devel
+ BuildRequires:  binutils, java-devel < 1:1.7.0, boost-devel, zlib-devel
  BuildRequires:  python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
  BuildRequires:  neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
  BuildRequires:  libXext-devel, libXt-devel, libICE-devel, libjpeg-devel, make