- --disable-collada

* reportedly it does not work in LibreOffice 4.4
- added version numbers to some BuildRequires lines

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=240

4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
-size 555291

libreoffice.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  8 13:06:41 UTC 2015 - andras.timar@collabora.com
+
+- --disable-collada
+  * reportedly it does not work in LibreOffice 4.4
+- added version numbers to some BuildRequires lines
+
 -------------------------------------------------------------------
 Wed Apr  8 12:26:59 UTC 2015 - tchvatal@suse.com
 

libreoffice.spec

@@ -60,8 +60,6 @@ Source2003:     %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 Source2004:     %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 # Needed for wiki-published and always taken as bundled
 Source2005:     %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-# Currently not possible to unbundle, sucks
-Source2006:     %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
 # search help icons in %{_prefix}/share
 # FIXME: make it configurable in integrate into git
 Patch0:         officecfg-help-in-usr-share.diff
@@ -122,7 +120,7 @@ BuildRequires:  krb5
 BuildRequires:  krb5-devel
 BuildRequires:  libabw-devel
 BuildRequires:  libbase
-BuildRequires:  libcdr-devel
+BuildRequires:  libcdr-devel >= 0.1
 BuildRequires:  libcmis-devel >= 0.5.0
 BuildRequires:  libcppunit-devel
 BuildRequires:  libe-book-devel >= 0.1.1
@@ -143,7 +141,7 @@ BuildRequires:  liblangtag-devel
 BuildRequires:  liblayout
 BuildRequires:  liblcms2-devel
 BuildRequires:  libloader
-BuildRequires:  libmspub-devel
+BuildRequires:  libmspub-devel >= 0.1
 BuildRequires:  libmwaw-devel >= 0.3.4
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  libmysqlcppconn-devel >= 1.0.6
@@ -157,8 +155,8 @@ BuildRequires:  librevenge-devel >= 0.0.1
 BuildRequires:  librsvg-devel
 BuildRequires:  libserializer
 BuildRequires:  libtool
-BuildRequires:  libvisio-devel
-BuildRequires:  libwpd-devel
+BuildRequires:  libvisio-devel >= 0.1
+BuildRequires:  libwpd-devel >= 0.10
 BuildRequires:  libwpg-devel
 BuildRequires:  libwps-devel
 BuildRequires:  libxml2-devel
@@ -171,7 +169,6 @@ BuildRequires:  mozilla-nss-devel >= 3.9.3
 BuildRequires:  mythes-devel
 BuildRequires:  neon-devel >= 0.26.0
 BuildRequires:  npapi-sdk
-BuildRequires:  openCOLLADA-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  pam-devel
 BuildRequires:  patch
@@ -964,7 +961,7 @@ export NOCONFIGURE=yes
         --disable-ccache \
         --enable-gltf --with-system-libgltf \
         --disable-coinmp \
-        --enable-collada --with-system-opencollada \
+        --disable-collada \
         --enable-symbols
 # no coinormp packages for coinmp