From 02d87b3f0cb88533394cc7f3163428b762579d32 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 11 Dec 2015 16:19:06 +0100 Subject: [PATCH] allow to build with system libetonyek on rhel-7 --- libreoffice.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 0044d5a..2b41386 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -82,8 +82,7 @@ Source11: %{external_url}/liborcus-0.9.2.tar.gz Source12: %{external_url}/mdds_0.12.1.tar.bz2 Source13: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz Source14: %{external_url}/libwps-0.4.2.tar.bz2 -Source16: %{external_url}/libetonyek-0.1.5.tar.bz2 -%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libetonyek +%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps %endif %if 0%{?fedora} @@ -155,6 +154,7 @@ BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libcdr-0.1) BuildRequires: pkgconfig(libclucene-core) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libetonyek-0.1) BuildRequires: pkgconfig(libexttextcat) BuildRequires: pkgconfig(libfreehand-0.1) BuildRequires: pkgconfig(libidn) @@ -196,7 +196,6 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libcmis-0.5) BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) -BuildRequires: pkgconfig(libetonyek-0.1) BuildRequires: pkgconfig(libgltf-0.0) BuildRequires: pkgconfig(liborcus-0.10) BuildRequires: pkgconfig(libwps-0.4) @@ -996,6 +995,8 @@ git commit -q -a -m 'disable tests segfaulting on arm' %if 0%{?rhel} git rm writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw writerperfect/qa/unit/data/writer/libmwaw/pass/RagTime_5.5.rag git commit -am 'make tests pass with libmwaw 0.3.5' +git rm writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip +git commit -am 'make tests pass with libetonyek 0.1.2' %endif # Seeing .git dir makes some of the build tools change their behavior. @@ -1490,7 +1491,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libflatlo.so %{baseinstdir}/program/libfrmlo.so %if 0%{?rhel} -%{baseinstdir}/program/libetonyek-0.1-lo.so.* %{baseinstdir}/program/libwps-0.4-lo.so.* %endif %{baseinstdir}/program/libguesslanglo.so