[libreoffice/f20] use system libabw on rhel-7

[David Tardon]

commit 3373434343e3315ab04caf983793f9b1bc889c31
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Aug 26 16:31:50 2014 +0200

    use system libabw on rhel-7

 libreoffice.spec |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 8a7e536..397af94 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -83,11 +83,10 @@ Source30:       %{external_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.t
 Source31:       %{external_url}/libodfgen-0.0.4.tar.bz2
 Source32:       %{external_url}/libmwaw-0.2.0.tar.bz2
 Source33:       %{external_url}/libetonyek-0.0.4.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-mdds --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 --without-system-libfreehand --without-system-libcmis --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek
-%endif
 Source34:       %{external_url}/libabw-0.0.2.tar.bz2
+%global bundling_options %{?bundling_options} --without-system-mdds --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 --without-system-libfreehand --without-system-libcmis --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libabw
+%endif
 Source35:       %{external_url}/language-subtag-registry-2014-03-27.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-libabw
 %endif
 
 # build tools
@@ -154,6 +153,7 @@ BuildRequires: pkgconfig(xinerama)
 BuildRequires: pkgconfig(xt)
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(libabw-0.0)
 BuildRequires: pkgconfig(libcdr-0.0)
 BuildRequires: pkgconfig(libcmis-0.4)
 BuildRequires: pkgconfig(libetonyek-0.0)
@@ -162,7 +162,6 @@ BuildRequires: pkgconfig(libmwaw-0.2)
 BuildRequires: pkgconfig(libodfgen-0.0)
 %endif
 %if 0%{?fedora}
-BuildRequires: pkgconfig(libabw-0.0)
 BuildRequires: pkgconfig(libe-book-0.0)
 BuildRequires: pkgconfig(libeot)
 %endif