From 55c8f63f22bea9de08b1d9a50e7bd7089bf6dead Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 8 May 2011 10:40:19 +0200 Subject: [PATCH] of course it is... I'm an idiot This reverts commit 0a5a5f31c0e42f9f95f4cd7f702fac66875596b8. --- libreoffice.spec | 7 ++++--- sources | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index e0d7e1a..eea7e30 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,10 +49,11 @@ Source25: http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf222 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 #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose #backwards compatability. -Source29: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -Source30: http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 +Source30: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source31: http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++ BuildRequires: binutils, java-devel >= 1.6.0, boost-devel, zlib-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -755,6 +756,7 @@ cp %{SOURCE27} ext_sources cp %{SOURCE28} ext_sources cp %{SOURCE29} ext_sources cp %{SOURCE30} ext_sources +cp %{SOURCE31} ext_sources touch src.downloaded #use the RPM_OPT_FLAGS but remove the OOo overridden ones @@ -2011,7 +2013,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : - 3.4 beta4 - drop integrated 0001-Removed-duplicate-code-block-mis-merge-prolly.patch - drop integrated 7de0b88ce2dd932915894385b54be1897d5ee053.zip -- STLPort is not needed anymore * Mon Apr 18 2011 Caolán McNamara 3.3.99.1-2 - Resolves: rhbz#695509 crash in RefreshDocumentLB diff --git a/sources b/sources index 9bdd5bb..b45cece 100644 --- a/sources +++ b/sources @@ -20,6 +20,7 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 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 661b7a288052d26b9bf40ed5030071aa libreoffice-calc-3.3.99.4.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2