From eac72c585a3e58776e240f47fd3656f967a26e8b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 26 Apr 2016 08:22:22 +0200 Subject: [PATCH] fix bundled libs for rhel --- .gitignore | 10 +++++----- libreoffice.spec | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 3348b40..e4f1b38 100644 --- a/.gitignore +++ b/.gitignore @@ -7,11 +7,11 @@ /libreoffice-multiliblauncher.sh /0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz /4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz -/liborcus-0.9.2.tar.gz -/libpagemaker-0.0.2.tar.bz2 -/libwps-0.4.2.tar.bz2 -/mdds_0.12.1.tar.bz2 +/libcmis-0.5.1.tar.gz +/liborcus-0.11.1.tar.gz +/libpagemaker-0.0.3.tar.bz2 +/libwps-0.4.3.tar.bz2 +/mdds_1.1.0.tar.bz2 /libreoffice-5.1.0.0.beta2.tar.xz /libreoffice-help-5.1.0.0.beta2.tar.xz /libreoffice-translations-5.1.0.0.beta2.tar.xz diff --git a/libreoffice.spec b/libreoffice.spec index d18fedd..bc1e5d6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -91,12 +91,11 @@ Source48: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/ %if 0%{?rhel} Source100: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -Source101: %{external_url}/liborcus-0.9.2.tar.gz -# system mdds 0.10.3 causes a crash in sc_ucalc unit test -Source102: %{external_url}/mdds_0.12.1.tar.bz2 -Source103: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz -Source104: %{external_url}/libwps-0.4.2.tar.bz2 -Source105: %{external_url}/libpagemaker-0.0.2.tar.bz2 +Source101: %{external_url}/liborcus-0.11.1.tar.gz +Source102: %{external_url}/mdds_1.1.0.tar.bz2 +Source103: %{external_url}/libcmis-0.5.1.tar.gz +Source104: %{external_url}/libwps-0.4.3.tar.bz2 +Source105: %{external_url}/libpagemaker-0.0.3.tar.bz2 %global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker %endif