diff --git a/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip b/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip deleted file mode 100644 index 9bac764..0000000 --- a/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b -size 1180582 diff --git a/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip b/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip deleted file mode 100644 index 451c1f5..0000000 --- a/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 -size 153157 diff --git a/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip b/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip deleted file mode 100644 index 5d3558d..0000000 --- a/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743 -size 5750610 diff --git a/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip b/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip deleted file mode 100644 index 728e5d6..0000000 --- a/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 -size 762419 diff --git a/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip b/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip deleted file mode 100644 index ed38746..0000000 --- a/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8 -size 2938721 diff --git a/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip b/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip deleted file mode 100644 index 1d547e9..0000000 --- a/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 -size 2929311 diff --git a/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip b/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip deleted file mode 100644 index 3c982e6..0000000 --- a/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd -size 743031 diff --git a/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip b/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip deleted file mode 100644 index c7d04d8..0000000 --- a/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 -size 207563 diff --git a/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip b/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip deleted file mode 100644 index bd4a309..0000000 --- a/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772 -size 1396007 diff --git a/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip b/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip deleted file mode 100644 index d2e8098..0000000 --- a/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba -size 427800 diff --git a/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip b/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip deleted file mode 100644 index c1b3560..0000000 --- a/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 -size 211919 diff --git a/libreoffice.changes b/libreoffice.changes index 06bc1b0..83e5589 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Jan 8 14:05:14 UTC 2014 - mvyskocil@suse.com + +- Now builds with external dependencies + * flute + * libbase + * libfonts + * libformula + * liblayout + * libloader + * librepository + * libserializer + * pentaho-libxml + * pentaho-reporting-flow-engine + * sac +- enabled report builder + ------------------------------------------------------------------- Wed Jan 8 12:49:33 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index a50519f..f876a43 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -57,18 +57,17 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t # gdocs sources Source500: gdocs_3.0.0.tar.bz2 Source501: gdocs_3.0.0.diff -# Internal bundled stuff (jfreereport), should be unbundled -Source1000: %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip -Source1001: %{external_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip -Source1002: %{external_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip -Source1003: %{external_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip -Source1004: %{external_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip -Source1005: %{external_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip -Source1006: %{external_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip -Source1007: %{external_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip -Source1008: %{external_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip -Source1009: %{external_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip -Source1010: %{external_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +BuildRequires: flute +BuildRequires: libbase +BuildRequires: libfonts +BuildRequires: libformula +BuildRequires: liblayout +BuildRequires: libloader +BuildRequires: librepository +BuildRequires: libserializer +BuildRequires: pentaho-libxml +BuildRequires: pentaho-reporting-flow-engine +BuildRequires: sac # Internal bundled stuff we can't remove # XMLSec is patched over and over in here Source2000: %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -914,11 +913,7 @@ export NOCONFIGURE=yes --enable-vlc \ --enable-neon \ --with-system-ucpp \ - --disable-ccache \ -%ifarch ppc64 - --disable-report-builder \ -%endif - --without-system-jfreereport + --disable-ccache # hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701) sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py scripting/source/pyprov/officehelper.py