[libreoffice/f20] Related: rhbz#1119709 disable firebird on rhel

[David Tardon]

commit 7d5f9490e1d442846797acf0e2c6d7da5b9eed8f
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 21 13:16:09 2014 +0200

    Related: rhbz#1119709 disable firebird on rhel
    
    (cherry picked from commit 99e059b908c5400206a2df14c6d64f99e4fc6cff)
    
    Conflicts:
    	libreoffice.spec

 libreoffice.spec |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 061b671..d3f501a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -87,12 +87,10 @@ Source31:       %{external_url}/libmwaw-0.2.0.tar.bz2
 Source32:       %{external_url}/libetonyek-0.0.4.tar.bz2
 Source33:       %{external_url}/libfreehand-0.0.0.tar.bz2
 Source34:       %{external_url}/libe-book-0.0.3.tar.bz2
-Source35:       %{external_url}/Firebird-2.5.2.26540-0.tar.bz2
-Source36:       %{external_url}/libabw-0.0.2.tar.bz2
-Source37:       %{external_url}/libatomic_ops-7_2d.zip
-Source38:       %{external_url}/libeot-0.01.tar.bz2
-Source39:       %{external_url}/language-subtag-registry-2014-03-27.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-libcmis --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libebook --without-system-firebird --without-system-libabw --without-system-libatomic_ops --without-system-libeot
+Source35:       %{external_url}/libabw-0.0.2.tar.bz2
+Source36:       %{external_url}/libeot-0.01.tar.bz2
+Source37:       %{external_url}/language-subtag-registry-2014-03-27.tar.bz2
+%global bundling_options %{?bundling_options} --without-system-libcmis --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libebook --without-system-libabw --without-system-libeot
 %endif
 
 # build tools
@@ -1194,13 +1192,13 @@ export CXXFLAGS=$ARCH_FLAGS
 %if 0%{?rhel}
 %if 0%{?rhel} < 7
 # make segfaults on parallel build
-%define distrooptions --disable-gio --disable-graphite --without-junit --enable-gstreamer-0-10 --disable-gstreamer --disable-postgresql-sdbc --enable-python=system --with-system-hsqldb --without-doxygen --with-parallelism=-j1
+%define distrooptions --disable-firebird-sdbc --disable-gio --disable-graphite --without-junit --enable-gstreamer-0-10 --disable-gstreamer --disable-postgresql-sdbc --enable-python=system --with-system-hsqldb --without-doxygen --with-parallelism=-j1
 
 %ifarch s390 s390x
 %define archoptions --disable-sdremote-bluetooth
 %endif
 %else # rhel7
-%define distrooptions --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes --enable-python=system %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
+%define distrooptions --disable-firebird-sdbc --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes --enable-python=system %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
 %endif
 %else # fedora
 %define distrooptions --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
@@ -1631,7 +1629,9 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %{baseinstdir}/program/liberalo.so
 %{baseinstdir}/program/libetilo.so
 %{baseinstdir}/program/libexplo.so
+%if 0%{?fedora}
 %{baseinstdir}/program/libfirebird_sdbclo.so
+%endif
 %{baseinstdir}/program/libicdlo.so
 %{baseinstdir}/program/libicglo.so
 %{baseinstdir}/program/libidxlo.so