[libreoffice] rhel-7 has to bundle liborcus too

[David Tardon]

commit fc9bf0ff0ae506ca098109aa6eb3aff05d77c833
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 26 12:03:09 2014 +0200

    rhel-7 has to bundle liborcus too

 libreoffice.spec |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index acf8a1c..3e3c719 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -63,26 +63,26 @@ Source10:       %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zi
 Source11:       %{external_url}/aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2
 Source12:       %{external_url}/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip
 Source13:       %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
-%global bundling_options %{?bundling_options} --without-system-mdds --without-system-glew --without-system-glm
+Source14:       %{external_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
+%global bundling_options %{?bundling_options} --without-system-mdds --without-system-glew --without-system-glm --without-system-orcus
 %if 0%{?rhel} < 7
-Source14:       %{external_url}/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
-Source15:       %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
-Source16:       %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
-Source17:       %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
-Source18:       %{external_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-Source19:       %{external_url}/libcdr-0.0.15.tar.bz2
-Source20:       %{external_url}/b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
-Source21:       %{external_url}/a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
-Source22:       %{external_url}/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
-Source23:       %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-Source24:       %{external_url}/libvisio-0.0.31.tar.bz2
-Source25:       %{external_url}/lcms2-2.6.tar.gz
-Source26:       %{external_url}/libmspub-0.0.6.tar.bz2
-Source27:       %{external_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
+Source15:       %{external_url}/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
+Source16:       %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
+Source17:       %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
+Source18:       %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
+Source19:       %{external_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+Source20:       %{external_url}/libcdr-0.0.15.tar.bz2
+Source21:       %{external_url}/b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
+Source22:       %{external_url}/a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
+Source23:       %{external_url}/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
+Source24:       %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+Source25:       %{external_url}/libvisio-0.0.31.tar.bz2
+Source26:       %{external_url}/lcms2-2.6.tar.gz
+Source27:       %{external_url}/libmspub-0.0.6.tar.bz2
 Source28:       %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 Source29:       %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 Source30:       %{external_url}/harfbuzz-0.9.23.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-mythes --without-system-redland --without-system-libexttextcat --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-clucene --without-system-libvisio --without-system-lcms2 --without-system-libmspub --without-system-orcus --without-system-liblangtag --without-system-boost --without-system-harfbuzz
+%global bundling_options %{?bundling_options} --without-system-mythes --without-system-redland --without-system-libexttextcat --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-clucene --without-system-libvisio --without-system-lcms2 --without-system-libmspub --without-system-liblangtag --without-system-boost --without-system-harfbuzz
 %endif
 Source31:       %{external_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 Source32:       %{external_url}/libodfgen-0.0.4.tar.bz2
@@ -175,6 +175,7 @@ BuildRequires: pkgconfig(libetonyek-0.0)
 BuildRequires: pkgconfig(libfreehand-0.0)
 BuildRequires: pkgconfig(libmwaw-0.2)
 BuildRequires: pkgconfig(libodfgen-0.0)
+BuildRequires: pkgconfig(liborcus-0.8)
 BuildRequires: pkgconfig(mdds)
 %endif
 BuildRequires: pkgconfig(libcurl)
@@ -187,7 +188,6 @@ BuildRequires: pkgconfig(libidn)
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: pkgconfig(liblangtag)
 BuildRequires: pkgconfig(libmspub-0.0)
-BuildRequires: pkgconfig(liborcus-0.8)
 BuildRequires: pkgconfig(libvisio-0.0)
 BuildRequires: pkgconfig(libwpd-0.9)
 BuildRequires: pkgconfig(libwpg-0.2)