dtardon pushed to libreoffice (f22). "disable gltf on rhel (..more)"

[notifications at fedoraproject.org]

>From cdc0f7969873262d1b86832a2f39ae5e885f5b2a Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Mon, 4 May 2015 14:02:29 +0200
Subject: disable gltf on rhel

(cherry picked from commit 268ab33bb82965fbbf229140a6179806eb95ceab)

diff --git a/libreoffice.spec b/libreoffice.spec
index 550e8b7..522467b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -108,12 +108,13 @@ Source35:       %{external_url}/libetonyek-0.1.1.tar.bz2
 Source36:       %{external_url}/libfreehand-0.1.0.tar.bz2
 Source37:       %{external_url}/libabw-0.1.1.tar.bz2
 Source38:       %{external_url}/librevenge-0.0.2.tar.bz2
-Source39:       %{external_url}/libgltf-0.0.2.tar.bz2
-Source40:       %{external_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
-Source41:       %{external_url}/libpagemaker-0.0.2.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-libcmis --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libabw --without-system-librevenge --without-system-libgltf --without-system-opencollada --without-system-libpagemaker
+Source39:       %{external_url}/libpagemaker-0.0.2.tar.bz2
+%global bundling_options %{?bundling_options} --without-system-libcmis --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libabw --without-system-librevenge --without-system-libpagemaker
+%endif
+
+%if 0%{?fedora}
+Source40:       %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
 %endif
-Source42:       %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
 
 # build tools
 BuildRequires: autoconf
@@ -1214,16 +1215,16 @@ export CXXFLAGS=$ARCH_FLAGS
 %if 0%{?rhel}
 %if 0%{?rhel} < 7
 # make segfaults on parallel build
-%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
+%define distrooptions --disable-eot --disable-gltf --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
 %endif
 %else # rhel7
-%define distrooptions --disable-eot --disable-firebird-sdbc --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes --enable-python=system %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
+%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 %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
+%define distrooptions --enable-eot --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer --with-system-mythes --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
@@ -1270,9 +1271,7 @@ touch autogen.lastrun
  --with-external-tar="$EXTSRCDIR" \
  --with-help \
  --with-system-dicts \
- --with-system-libgltf \
  --with-system-libs \
- --with-system-opencollada \
  --with-system-ucpp \
  --without-fonts \
  --without-ppds \
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f22&id=cdc0f7969873262d1b86832a2f39ae5e885f5b2a