Hello community, here is the log from the commit of package openCOLLADA for openSUSE:Factory checked in at 2016-08-18 10:20:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openCOLLADA (Old) and /work/SRC/openSUSE:Factory/.openCOLLADA.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openCOLLADA" Changes: -------- --- /work/SRC/openSUSE:Factory/openCOLLADA/openCOLLADA.changes 2016-05-31 12:10:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes 2016-08-18 10:20:32.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Aug 16 13:48:09 UTC 2016 - jeng...@inai.de + +- Update rpm groups and descriptions + +------------------------------------------------------------------- +Sun Aug 14 15:28:36 UTC 2016 - davejpla...@gmail.com + +- Update to release version 1.6.25 +- Renamed openCOLLADA-devel to libopenCOLLADA-devel, openCOLLADA-doc + to libopenCOLLADA-doc and openCOLLADA-util to libopenCOLLADA-util + due to upstream having a correct versioning scheme and version + numbers derived from git are no longer neccessary. Conflicted, + provided and obsoleted the old packages. +- Split libraries into separate sub packages. +- Refreshed patches. +- For upstream changes see: + https://github.com/KhronosGroup/OpenCOLLADA/tree/v1.6.25 + +------------------------------------------------------------------- Old: ---- OpenCOLLADA-3335ac1.tar.bz2 New: ---- OpenCOLLADA-1.6.25.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openCOLLADA.spec ++++++ --- /var/tmp/diff_new_pack.0NqFO8/_old 2016-08-18 10:20:34.000000000 +0200 +++ /var/tmp/diff_new_pack.0NqFO8/_new 2016-08-18 10:20:34.000000000 +0200 @@ -17,19 +17,22 @@ %global sover 0.2 -%global commit 3335ac164e68b2512a40914b14c74db260e6ff7d -%global shortcommit 3335ac1 +%global sfx 0_2 +#3335ac164e68b2512a40914b14c74db260e6ff7d +#3335ac1 %global upname OpenCOLLADA -%global libname lib%{upname}0 +%global libname libopenCOLLADA Name: openCOLLADA -Version: 1_%{shortcommit} +Version: 1.6.25 Release: 0 +#1_%%{shortcommit} Summary: Collada 3D import and export libraries License: MIT -Group: System/Libraries +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}-%{shortcommit}.tar.bz2 +Source0: %{upname}-%{version}.tar.xz # PATCH-FIX-UPSTREAM use proper paths in cmake for install Patch0: opencollada-cmake.patch # PATCH-FIX-UPSTREAM add missing includes @@ -40,79 +43,176 @@ Patch3: openCOLLADA-signed-char.patch BuildRequires: cmake BuildRequires: dos2unix -BuildRequires: fftw-devel BuildRequires: gcc-c++ +BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpcrecpp) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(zlib) %description -COLLADA is a royalty-free XML schema that enables digital asset -exchange within the interactive 3D industry. -OpenCOLLADA is a Google summer of code opensource project providing -libraries for 3D file interchange between applications like blender. -COLLADABaseUtils Utils used by many of the other projects -COLLADAFramework Datamodel used to load COLLADA files -COLLADAStreamWriter Sources (Library to write COLLADA files) -COLLADASaxFrameworkLoader Library that loads COLLADA files in a sax - like manner into the framework data model -COLLADAValidator XML validator for COLLADA files, based on +COLLADA is an XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender: +* COLLADABaseUtils - Utils used by many of the other projects +* COLLADAFramework - Datamodel used to load COLLADA files +* COLLADAStreamWriter - Sources (Library to write COLLADA files) +* COLLADASaxFrameworkLoader - Library that loads COLLADA files in a + SAX-like manner into the framework data model +* COLLADAValidator - XML validator for COLLADA files, based on the COLLADASaxFrameworkLoader -GeneratedSaxParser Library used to load xml files in the way +* GeneratedSaxParser - Library used to load xml files in the way used by COLLADASaxFrameworkLoader -%package -n %{libname} +%package -n libftoa%{sfx} Summary: Collada 3D import and export libraries Group: System/Libraries +Conflicts: libOpenCOLLADA0 -%description -n %{libname} -COLLADA is a royalty-free XML schema that enables digital asset -exchange within the interactive 3D industry. -OpenCOLLADA is a Google summer of code opensource project providing -libraries for 3D file interchange between applications like blender. -COLLADABaseUtils Utils used by many of the other projects -COLLADAFramework Datamodel used to load COLLADA files -COLLADAStreamWriter Sources (Library to write COLLADA files) -COLLADASaxFrameworkLoader Library that loads COLLADA files in a sax - like manner into the framework data model -COLLADAValidator XML validator for COLLADA files, based on - the COLLADASaxFrameworkLoader -GeneratedSaxParser Library used to load xml files in the way - used by COLLADASaxFrameworkLoader +%description -n libftoa%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +%package -n libbuffer%{sfx} +Summary: Collada 3D import and export libraries +Group: System/Libraries +Conflicts: libOpenCOLLADA0 + +%description -n libbuffer%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +%package -n libGeneratedSaxParser%{sfx} +Summary: Collada 3D import and export libraries +Group: System/Libraries +Conflicts: libOpenCOLLADA0 + +%description -n libGeneratedSaxParser%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +GeneratedSaxParser is the library used to load xml files in the way +used by COLLADASaxFrameworkLoader. + +%package -n libMathMLSolver%{sfx} +Summary: Collada 3D import and export libraries +Group: System/Libraries +Conflicts: libOpenCOLLADA0 + +%description -n libMathMLSolver%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +%package -n libOpenCOLLADABaseUtils%{sfx} +Summary: Collada 3D import and export libraries +Group: System/Libraries +Conflicts: libOpenCOLLADA0 + +%description -n libOpenCOLLADABaseUtils%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +COLLADABaseUtils is the package of utilitie used by many of the other +projects. + +%package -n libOpenCOLLADAFramework%{sfx} +Summary: Collada 3D import and export libraries +Group: System/Libraries +Conflicts: libOpenCOLLADA0 + +%description -n libOpenCOLLADAFramework%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +COLLADAFramework is the datamodel used to load COLLADA files. + +%package -n libOpenCOLLADASaxFrameworkLoader%{sfx} +Summary: Collada 3D import and export libraries +Group: System/Libraries +Conflicts: libOpenCOLLADA0 + +%description -n libOpenCOLLADASaxFrameworkLoader%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +COLLADASaxFrameworkLoader is a library that loads COLLADA files in a +SAX-like manner into the data framework model and is used by +COLLADASaxFrameworkLoader. + +%package -n libOpenCOLLADAStreamWriter%{sfx} +Summary: Collada 3D import and export libraries +Group: System/Libraries +Conflicts: libOpenCOLLADA0 + +%description -n libOpenCOLLADAStreamWriter%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +COLLADAStreamWriter contains the library to write COLLADA files. + +%package -n libUTF%{sfx} +Summary: Collada 3D import and export libraries +Group: System/Libraries +Conflicts: libOpenCOLLADA0 -%package doc +%description -n libUTF%{sfx} +COLLADA is a XML schema that enables digital asset exchange within +the interactive 3D industry. OpenCOLLADA is a project providing +libraries for 3D file interchange between applications like Blender. + +%package -n %{libname}-doc Summary: Developer documentation for %{name} -Group: Documentation -Requires: %{libname} = %{version} +Group: Documentation/HTML +Provides: %{name}-doc > 1_3335ac1 +Obsoletes: %{name}-doc <= 1_3335ac1 BuildArch: noarch -%description doc +%description -n %{libname}-doc This package provides documentation for %{name}. -%package devel +%package -n %{libname}-devel Summary: Include files for openCOLLADA development -Group: Development/Libraries -Requires: %{libname} = %{version} +Group: Development/Libraries/C and C++ +Requires: libGeneratedSaxParser%{sfx} = %{version} +Requires: libMathMLSolver%{sfx} = %{version} +Requires: libOpenCOLLADABaseUtils%{sfx} = %{version} +Requires: libOpenCOLLADAFramework%{sfx} = %{version} +Requires: libOpenCOLLADASaxFrameworkLoader%{sfx} = %{version} +Requires: libOpenCOLLADAStreamWriter%{sfx} = %{version} +Requires: libUTF%{sfx} = %{version} +Requires: libbuffer%{sfx} = %{version} +Requires: libftoa%{sfx} = %{version} +Provides: %{name}-devel > 1_3335ac1 +Obsoletes: %{name}-devel <= 1_3335ac1 +Recommends: %{libname}-doc = %{version} -%description devel +%description -n %{libname}-devel This package provides the include files necessary to build and develop with the %{name} export and import libraries. -%package utils +%package -n %{libname}-utils Summary: XML validator for COLLADA files Group: Development/Tools -Requires: %{libname} = %{version} +Provides: %{name}-utils > 1_3335ac1 +Obsoletes: %{name}-utils <= 1_3335ac1 -%description utils +%description -n %{libname}-utils XML validator for COLLADA files, based on the COLLADASaxFrameworkLoader. %prep -%setup -q -n %{upname}-%{commit} -%patch0 -p1 -b .cmake +%setup -q -n %{upname}-%{version} +%patch0 -p0 -b .cmake %patch1 -p0 -b .includes -%patch2 -p1 -b .undefined -%patch3 -p1 +%patch2 -p0 -b .undefined +%patch3 -p0 # Remove unused bundled libraries rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib} @@ -152,26 +252,81 @@ mkdir -p %{buildroot}%{_includedir}/MathMLSolver cp -a Externals/MathMLSolver/include/* %{buildroot}%{_includedir}/MathMLSolver/ -%post -n %{libname} -p /sbin/ldconfig +%post -n libbuffer%{sfx} -p /sbin/ldconfig +%postun -n libbuffer%{sfx} -p /sbin/ldconfig + +%post -n libftoa%{sfx} -p /sbin/ldconfig +%postun -n libftoa%{sfx} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig +%post -n libGeneratedSaxParser%{sfx} -p /sbin/ldconfig +%postun -n libGeneratedSaxParser%{sfx} -p /sbin/ldconfig -%files -n %{libname} +%post -n libMathMLSolver%{sfx} -p /sbin/ldconfig +%postun -n libMathMLSolver%{sfx} -p /sbin/ldconfig + +%post -n libOpenCOLLADABaseUtils%{sfx} -p /sbin/ldconfig +%postun -n libOpenCOLLADABaseUtils%{sfx} -p /sbin/ldconfig + +%post -n libOpenCOLLADAFramework%{sfx} -p /sbin/ldconfig +%postun -n libOpenCOLLADAFramework%{sfx} -p /sbin/ldconfig + +%post -n libOpenCOLLADASaxFrameworkLoader%{sfx} -p /sbin/ldconfig +%postun -n libOpenCOLLADASaxFrameworkLoader%{sfx} -p /sbin/ldconfig + +%post -n libOpenCOLLADAStreamWriter%{sfx} -p /sbin/ldconfig +%postun -n libOpenCOLLADAStreamWriter%{sfx} -p /sbin/ldconfig + +%post -n libUTF%{sfx} -p /sbin/ldconfig +%postun -n libUTF%{sfx} -p /sbin/ldconfig + +%files -n libbuffer%{sfx} %defattr(-,root,root) -%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS -%{_libdir}/lib*.so.%{sover} +%{_libdir}/libbuffer.so.%{sover} + +%files -n libftoa%{sfx} +%defattr(-,root,root) +%{_libdir}/libftoa.so.%{sover} + +%files -n libGeneratedSaxParser%{sfx} +%defattr(-,root,root) +%{_libdir}/libGeneratedSaxParser.so.%{sover} + +%files -n libMathMLSolver%{sfx} +%defattr(-,root,root) +%{_libdir}/libMathMLSolver.so.%{sover} + +%files -n libOpenCOLLADABaseUtils%{sfx} +%defattr(-,root,root) +%{_libdir}/libOpenCOLLADABaseUtils.so.%{sover} + +%files -n libOpenCOLLADAFramework%{sfx} +%defattr(-,root,root) +%{_libdir}/libOpenCOLLADAFramework.so.%{sover} + +%files -n libOpenCOLLADASaxFrameworkLoader%{sfx} +%defattr(-,root,root) +%{_libdir}/libOpenCOLLADASaxFrameworkLoader.so.%{sover} + +%files -n libOpenCOLLADAStreamWriter%{sfx} +%defattr(-,root,root) +%{_libdir}/libOpenCOLLADAStreamWriter.so.%{sover} + +%files -n libUTF%{sfx} +%defattr(-,root,root) +%{_libdir}/libUTF.so.%{sover} -%files doc +%files -n %{libname}-doc %defattr(-,root,root) %doc htdocs/ -%files devel +%files -n %{libname}-devel %defattr(-,root,root) +%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS %{_libdir}/*.so %{_libdir}/cmake/* %{_includedir}/* -%files utils +%files -n %{libname}-utils %defattr(-,root,root) %{_bindir}/* ++++++ openCOLLADA-signed-char.patch ++++++ --- /var/tmp/diff_new_pack.0NqFO8/_old 2016-08-18 10:20:34.000000000 +0200 +++ /var/tmp/diff_new_pack.0NqFO8/_new 2016-08-18 10:20:34.000000000 +0200 @@ -1,7 +1,7 @@ -Index: OpenCOLLADA-3335ac164e68b2512a40914b14c74db260e6ff7d/COLLADABaseUtils/src/COLLADABUURI.cpp +Index: COLLADABaseUtils/src/COLLADABUURI.cpp =================================================================== ---- OpenCOLLADA-3335ac164e68b2512a40914b14c74db260e6ff7d.orig/COLLADABaseUtils/src/COLLADABUURI.cpp -+++ OpenCOLLADA-3335ac164e68b2512a40914b14c74db260e6ff7d/COLLADABaseUtils/src/COLLADABUURI.cpp +--- COLLADABaseUtils/src/COLLADABUURI.cpp.orig ++++ COLLADABaseUtils/src/COLLADABUURI.cpp @@ -32,7 +32,7 @@ namespace COLLADABU ++++++ opencollada-cmake.patch ++++++ --- /var/tmp/diff_new_pack.0NqFO8/_old 2016-08-18 10:20:34.000000000 +0200 +++ /var/tmp/diff_new_pack.0NqFO8/_new 2016-08-18 10:20:34.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Naur OpenCOLLADA.orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt ---- OpenCOLLADA.orig/CMakeLists.txt 2013-08-10 02:00:51.000000000 -0500 -+++ OpenCOLLADA/CMakeLists.txt 2013-08-28 10:34:50.122102989 -0500 -@@ -77,7 +77,7 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -84,7 +84,7 @@ macro(opencollada_add_lib message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") endif () add_library(${name}_shared SHARED ${sources}) @@ -10,7 +11,7 @@ foreach(target_lib ${target_libs}) if(TARGET ${target_lib}_shared) target_link_libraries(${name}_shared ${target_lib}_shared) -@@ -178,8 +178,8 @@ +@@ -190,8 +190,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} #----------------------------------------------------------------------------- # Install vars ++++++ opencollada-includes.patch ++++++ --- /var/tmp/diff_new_pack.0NqFO8/_old 2016-08-18 10:20:34.000000000 +0200 +++ /var/tmp/diff_new_pack.0NqFO8/_new 2016-08-18 10:20:34.000000000 +0200 @@ -1,7 +1,7 @@ Index: COLLADAFramework/include/COLLADAFWInstanceBindingBase.h =================================================================== ---- COLLADAFramework/include/COLLADAFWInstanceBindingBase.h.orig 2015-04-29 02:18:07.000000000 +0200 -+++ COLLADAFramework/include/COLLADAFWInstanceBindingBase.h 2015-08-04 14:32:51.229635342 +0200 +--- COLLADAFramework/include/COLLADAFWInstanceBindingBase.h.orig ++++ COLLADAFramework/include/COLLADAFWInstanceBindingBase.h @@ -20,6 +20,11 @@ #include <vector> ++++++ opencollada-no-undefined.patch ++++++ --- /var/tmp/diff_new_pack.0NqFO8/_old 2016-08-18 10:20:34.000000000 +0200 +++ /var/tmp/diff_new_pack.0NqFO8/_new 2016-08-18 10:20:34.000000000 +0200 @@ -1,7 +1,7 @@ -Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt +Index: common/libBuffer/CMakeLists.txt =================================================================== ---- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/common/libBuffer/CMakeLists.txt -+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt +--- common/libBuffer/CMakeLists.txt.orig ++++ common/libBuffer/CMakeLists.txt @@ -28,7 +28,10 @@ set(SRC include/performanceTest/performanceTest.h ) @@ -14,11 +14,11 @@ include_directories( ${libBuffer_include_dirs} -Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt +Index: CMakeLists.txt =================================================================== ---- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/CMakeLists.txt -+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt -@@ -244,10 +244,10 @@ else () # if pcre not found building it +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -270,10 +270,10 @@ else () # if pcre not found building it endif () # building required libs
