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

[David Tardon]

commit 2a201b230f7b3b92c1e5bc676d0213ad3dae3e83
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Aug 26 16:30:39 2014 +0200

    use system libmwaw on rhel-7

 libreoffice.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index a8739de..0b6570c 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -81,13 +81,13 @@ Source28:       %{external_url}/harfbuzz-0.9.23.tar.bz2
 Source29:       %{external_url}/libfreehand-0.0.0.tar.bz2
 Source30:       %{external_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 Source31:       %{external_url}/libodfgen-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
-%endif
 Source32:       %{external_url}/libmwaw-0.2.0.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
+%endif
 Source33:       %{external_url}/libetonyek-0.0.4.tar.bz2
 Source34:       %{external_url}/libabw-0.0.2.tar.bz2
 Source35:       %{external_url}/language-subtag-registry-2014-03-27.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-libmwaw --without-system-libetonyek --without-system-libabw
+%global bundling_options %{?bundling_options} --without-system-libetonyek --without-system-libabw
 %endif
 
 # build tools
@@ -157,6 +157,7 @@ BuildRequires: pkgconfig(lcms2)
 BuildRequires: pkgconfig(libcdr-0.0)
 BuildRequires: pkgconfig(libcmis-0.4)
 BuildRequires: pkgconfig(libfreehand-0.0)
+BuildRequires: pkgconfig(libmwaw-0.2)
 BuildRequires: pkgconfig(libodfgen-0.0)
 %endif
 %if 0%{?fedora}
@@ -164,7 +165,6 @@ BuildRequires: pkgconfig(libabw-0.0)
 BuildRequires: pkgconfig(libe-book-0.0)
 BuildRequires: pkgconfig(libeot)
 BuildRequires: pkgconfig(libetonyek-0.0)
-BuildRequires: pkgconfig(libmwaw-0.2)
 %endif
 BuildRequires: pkgconfig(libcurl)
 %if 0%{?fedora} || 0%{?rhel} >= 7