Hello community, here is the log from the commit of package openCOLLADA for openSUSE:Factory checked in at 2017-04-20 20:47:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openCOLLADA (Old) and /work/SRC/openSUSE:Factory/.openCOLLADA.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openCOLLADA" Thu Apr 20 20:47:15 2017 rev:25 rq:487486 version:1.6.43 Changes: -------- --- /work/SRC/openSUSE:Factory/openCOLLADA/openCOLLADA.changes 2016-08-18 10:20:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes 2017-04-20 20:47:17.662977772 +0200 @@ -1,0 +2,15 @@ +Tue Apr 11 10:39:50 UTC 2017 - jeng...@inai.de + +- RPM group fix + +------------------------------------------------------------------- +Fri Apr 7 11:45:13 UTC 2017 - davejpla...@gmail.com + +- Update to version 1.6.43 +- Rebased opencollada-no-undefined.patch +- Added openCOLLADA-no-daevalidator.patch to prevent the building + of the app DAEvalidator which tries to use internal zlib. +- For upstream changes see: + https://github.com/KhronosGroup/OpenCOLLADA/tree/v1.6.43 + +------------------------------------------------------------------- Old: ---- OpenCOLLADA-1.6.25.tar.xz New: ---- OpenCOLLADA-1.6.43.tar.gz openCOLLADA-no-daevalidator.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openCOLLADA.spec ++++++ --- /var/tmp/diff_new_pack.2lhUyb/_old 2017-04-20 20:47:19.302745927 +0200 +++ /var/tmp/diff_new_pack.2lhUyb/_new 2017-04-20 20:47:19.302745927 +0200 @@ -1,7 +1,7 @@ # # spec file for package openCOLLADA # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,16 +23,16 @@ %global upname OpenCOLLADA %global libname libopenCOLLADA Name: openCOLLADA -Version: 1.6.25 +Version: 1.6.43 Release: 0 #1_%%{shortcommit} Summary: Collada 3D import and export libraries +#https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.43.tar.gz License: MIT Group: Development/Libraries/C and C++ -#https://github.com/KhronosGroup/OpenCOLLADA/releases Url: https://collada.org/mediawiki/index.php/OpenCOLLADA ## https://github.com/KhronosGroup/OpenCOLLADA/archive/%%{commit}/ -Source0: %{upname}-%{version}.tar.xz +Source0: https://github.com/KhronosGroup/%{upname}/archive/v%{version}.tar.gz#/%{upname}-%{version}.tar.gz # PATCH-FIX-UPSTREAM use proper paths in cmake for install Patch0: opencollada-cmake.patch # PATCH-FIX-UPSTREAM add missing includes @@ -41,6 +41,8 @@ Patch2: opencollada-no-undefined.patch # PATCH-FIX-UPSTREAM openCOLLADA-signed-char.patch gh#KhronosGroup/OpenCOLLADA#439 dims...@opensuse.org -- Use signed char; 'char' by itself depends on arch implementation Patch3: openCOLLADA-signed-char.patch +# PATCH-FIX-OPENSUSE openCOLLADA-no-daevalidator.patch davejpla...@gmail.com - Don't build DAEvalidator app. +Patch4: openCOLLADA-no-daevalidator.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ @@ -213,6 +215,7 @@ %patch1 -p0 -b .includes %patch2 -p0 -b .undefined %patch3 -p0 +%patch4 # Remove unused bundled libraries rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib} ++++++ openCOLLADA-no-daevalidator.patch ++++++ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig 2017-04-07 13:06:52.894187859 +0200 +++ CMakeLists.txt 2017-04-07 13:16:11.357063874 +0200 @@ -274,7 +274,7 @@ add_subdirectory(common/libftoa) add_subdirectory(common/libBuffer) add_subdirectory(${EXTERNAL_LIBRARIES}/UTF) add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver) -add_subdirectory(${EXTERNAL_LIBRARIES}/zlib) +#add_subdirectory(${EXTERNAL_LIBRARIES}/zlib) # building OpenCOLLADA libs add_subdirectory(COLLADABaseUtils) @@ -286,8 +286,8 @@ add_subdirectory(COLLADAStreamWriter) # building COLLADAValidator app add_subdirectory(COLLADAValidator) -# DAE validator app -add_subdirectory(DAEValidator) +# don't build DAE validator app +#add_subdirectory(DAEValidator) # Library export install(EXPORT LibraryExport DESTINATION ${OPENCOLLADA_INST_CMAKECONFIG} FILE OpenCOLLADATargets.cmake) ++++++ opencollada-no-undefined.patch ++++++ --- /var/tmp/diff_new_pack.2lhUyb/_old 2017-04-20 20:47:19.366736879 +0200 +++ /var/tmp/diff_new_pack.2lhUyb/_new 2017-04-20 20:47:19.366736879 +0200 @@ -1,7 +1,7 @@ Index: common/libBuffer/CMakeLists.txt =================================================================== ---- common/libBuffer/CMakeLists.txt.orig -+++ common/libBuffer/CMakeLists.txt +--- common/libBuffer/CMakeLists.txt.orig 2017-04-07 12:53:25.430993165 +0200 ++++ common/libBuffer/CMakeLists.txt 2017-04-07 12:57:24.079017495 +0200 @@ -28,7 +28,10 @@ set(SRC include/performanceTest/performanceTest.h ) @@ -14,20 +14,3 @@ include_directories( ${libBuffer_include_dirs} -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -270,10 +270,10 @@ else () # if pcre not found building it - endif () - - # building required libs -+add_subdirectory(${EXTERNAL_LIBRARIES}/UTF) -+add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver) - add_subdirectory(common/libftoa) - add_subdirectory(common/libBuffer) --add_subdirectory(${EXTERNAL_LIBRARIES}/UTF) --add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver) - - # building OpenCOLLADA libs - add_subdirectory(COLLADABaseUtils)
