dtardon pushed to libreoffice (f21). "force system libgltf"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 5 07:04:12 UTC 2015
>From fce63a6450ea95730592033613738cd45773128d Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Tue, 5 May 2015 09:03:34 +0200
Subject: force system libgltf
diff --git a/libreoffice.spec b/libreoffice.spec
index 1d09918..1864692 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1283,7 +1283,7 @@ export CXXFLAGS=$ARCH_FLAGS
%define distrooptions --disable-eot --disable-gltf --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-eot --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes --with-system-opencollada %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
+%define distrooptions --enable-eot --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes --with-system-libgltf --with-system-opencollada %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser'
export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser'
%endif
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f21&id=fce63a6450ea95730592033613738cd45773128d
More information about the scm-commits
mailing list