rhbz#1209852 enable accidentally disabled GIO UCP

f41
David Tardon 10 years ago
parent 0d4f7c12f2
commit 4be21a4f29

@ -1213,7 +1213,7 @@ export CXXFLAGS=$ARCH_FLAGS
%if 0%{?rhel} %if 0%{?rhel}
%if 0%{?rhel} < 7 %if 0%{?rhel} < 7
# make segfaults on parallel build # 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 %ifarch s390 s390x
%define archoptions --disable-sdremote-bluetooth %define archoptions --disable-sdremote-bluetooth
@ -1945,9 +1945,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%config %{baseinstdir}/share/psprint/psprint.conf %config %{baseinstdir}/share/psprint/psprint.conf
%{baseinstdir}/share/psprint/driver %{baseinstdir}/share/psprint/driver
%dir %{baseinstdir}/share/registry %dir %{baseinstdir}/share/registry
%if 0%{?fedora} || 0%{?rhel} >= 7
%{baseinstdir}/share/registry/gnome.xcd %{baseinstdir}/share/registry/gnome.xcd
%endif
%{baseinstdir}/share/registry/lingucomponent.xcd %{baseinstdir}/share/registry/lingucomponent.xcd
%{baseinstdir}/share/registry/main.xcd %{baseinstdir}/share/registry/main.xcd
%{baseinstdir}/share/registry/oo-ad-ldap.xcd.sample %{baseinstdir}/share/registry/oo-ad-ldap.xcd.sample
@ -2011,9 +2009,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libxmlscriptlo.so %{baseinstdir}/program/libxmlscriptlo.so
%{baseinstdir}/program/libxolo.so %{baseinstdir}/program/libxolo.so
%{baseinstdir}/program/liblocalebe1lo.so %{baseinstdir}/program/liblocalebe1lo.so
%if 0%{?fedora} || 0%{?rhel} >= 7
%{baseinstdir}/program/libucpgio1lo.so %{baseinstdir}/program/libucpgio1lo.so
%endif
%{baseinstdir}/program/types/oovbaapi.rdb %{baseinstdir}/program/types/oovbaapi.rdb
#share unopkg #share unopkg
%dir %{baseinstdir}/share/extensions %dir %{baseinstdir}/share/extensions

Loading…
Cancel
Save