dtardon pushed to libreoffice (f20). "rhbz#1209852 enable accidentally disabled GIO UCP (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 15:19:49 UTC 2015
>From 493cdd04fd03163167196a1b31f3337e61fc1115 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Mon, 13 Apr 2015 17:16:02 +0200
Subject: rhbz#1209852 enable accidentally disabled GIO UCP
(cherry picked from commit 4be21a4f295eb86424a279f533f3ba54e89f95e7)
diff --git a/libreoffice.spec b/libreoffice.spec
index 4f4dd91..501453f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1237,7 +1237,7 @@ export CXXFLAGS=$ARCH_FLAGS
%if 0%{?rhel}
%if 0%{?rhel} < 7
# make segfaults on parallel build
-%define distrooptions --disable-eot --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
+%define distrooptions --disable-eot --disable-firebird-sdbc --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
@@ -1896,9 +1896,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%config %{baseinstdir}/share/psprint/psprint.conf
%{baseinstdir}/share/psprint/driver
%dir %{baseinstdir}/share/registry
-%if 0%{?fedora} || 0%{?rhel} >= 7
%{baseinstdir}/share/registry/gnome.xcd
-%endif
%{baseinstdir}/share/registry/lingucomponent.xcd
%{baseinstdir}/share/registry/main.xcd
%{baseinstdir}/share/registry/oo-ad-ldap.xcd.sample
@@ -1958,9 +1956,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libxmlscriptlo.so
%{baseinstdir}/program/libxolo.so
%{baseinstdir}/program/liblocalebe1lo.so
-%if 0%{?fedora} || 0%{?rhel} >= 7
%{baseinstdir}/program/libucpgio1lo.so
-%endif
%{baseinstdir}/program/types/oovbaapi.rdb
#share unopkg
%dir %{baseinstdir}/share/extensions
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f20&id=493cdd04fd03163167196a1b31f3337e61fc1115
More information about the scm-commits
mailing list