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

David Tardon dtardon at fedoraproject.org
Thu Aug 21 12:43:20 UTC 2014


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

    Related: rhbz#1119709 disable firebird on rhel

 libreoffice.spec |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 0580a3b..2076449 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -100,13 +100,12 @@ Source33:       %{external_url}/libmwaw-0.3.1.tar.bz2
 Source34:       %{external_url}/libetonyek-0.1.1.tar.bz2
 Source35:       %{external_url}/libfreehand-0.1.0.tar.bz2
 Source36:       %{external_url}/libe-book-0.1.1.tar.bz2
-Source37:       %{external_url}/Firebird-2.5.2.26540-0.tar.bz2
-Source38:       %{external_url}/libabw-0.1.0.tar.bz2
-Source39:       %{external_url}/libatomic_ops-7_2d.zip
-Source40:       %{external_url}/libeot-0.01.tar.bz2
-Source41:       %{external_url}/language-subtag-registry-2014-04-10.tar.bz2
-Source42:       %{external_url}/librevenge-0.0.1.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --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 --without-system-librevenge
+Source37:       %{external_url}/libabw-0.1.0.tar.bz2
+Source38:       %{external_url}/libatomic_ops-7_2d.zip
+Source39:       %{external_url}/libeot-0.01.tar.bz2
+Source40:       %{external_url}/language-subtag-registry-2014-04-10.tar.bz2
+Source41:       %{external_url}/librevenge-0.0.1.tar.bz2
+%global bundling_options %{?bundling_options} --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libcmis --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libebook --without-system-libabw --without-system-libatomic_ops --without-system-libeot --without-system-librevenge
 %endif
 
 # build tools
@@ -1202,13 +1201,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}}
@@ -1650,7 +1649,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
@@ -1848,10 +1849,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %{baseinstdir}/share/config/webcast
 %{baseinstdir}/share/config/wizard
 %dir %{baseinstdir}/share/dtd
-%if 0%{?rhel}
-%dir %{baseinstdir}/share/firebird
-%{baseinstdir}/share/firebird/firebird.msg
-%endif
 %{baseinstdir}/share/dtd/officedocument
 %{baseinstdir}/share/gallery
 %dir %{baseinstdir}/share/labels


More information about the scm-commits mailing list