Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package OpenColorIO for openSUSE:Factory checked in at 2021-07-23 23:41:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenColorIO (Old) and /work/SRC/openSUSE:Factory/.OpenColorIO.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenColorIO" Fri Jul 23 23:41:03 2021 rev:9 rq:907825 version:2.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenColorIO/OpenColorIO.changes 2021-07-03 20:51:06.520648824 +0200 +++ /work/SRC/openSUSE:Factory/.OpenColorIO.new.1899/OpenColorIO.changes 2021-07-23 23:41:08.997836065 +0200 @@ -1,0 +2,32 @@ +Thu Jul 22 10:38:41 UTC 2021 - Hans-Peter Jansen <[email protected]> + +- provide/obsolete python-OpenColorIO + +------------------------------------------------------------------- +Tue Jul 13 10:31:59 UTC 2021 - Hans-Peter Jansen <[email protected]> + +- Retain the %{yamlrequires} + +------------------------------------------------------------------- +Mon Jul 12 22:18:12 UTC 2021 - Hans-Peter Jansen <[email protected]> + +- Use %cmake_build + +------------------------------------------------------------------- +Mon Jul 5 16:15:59 UTC 2021 - Hans-Peter Jansen <[email protected]> + +- Update to version 2.0.1: + Unfortunately, it's missing a changelog, check GH release notes: + https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.0.1 +- Removed all patches: + * OpenColorIO-setuptools.patch + * 0003-Fix_Linux_compilation.patch + * 0004-Fix_build_with_GCC-8.patch + * 0005-Fix_build_with_yaml-cpp0.6.patch + None of them applied anymore +- Remove tarball crippling, doesn't contain Pygments anymore +- Update build dependencies +- Fix 64bit library install location +- cmake and python devel files disappeared + +------------------------------------------------------------------- Old: ---- 0003-Fix_Linux_compilation.patch 0004-Fix_build_with_GCC-8.patch 0005-Fix_build_with_yaml-cpp0.6.patch OpenColorIO-1.1.1-crippled.tar.gz OpenColorIO-setuptools.patch New: ---- OpenColorIO-2.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenColorIO.spec ++++++ --- /var/tmp/diff_new_pack.Bbodsk/_old 2021-07-23 23:41:09.637835248 +0200 +++ /var/tmp/diff_new_pack.Bbodsk/_new 2021-07-23 23:41:09.637835248 +0200 @@ -2,7 +2,6 @@ # spec file for package OpenColorIO # # Copyright (c) 2021 SUSE LLC -# Copyright (c) 2020 Asterios Dramis <[email protected]>. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,57 +19,39 @@ # Ensure that libyaml-cpp version is the one that is built against # See boo#1160171 %define yamlrequires %(rpm -q --requires yaml-cpp-devel | grep libyaml) -%define so_ver 1 +%define so_ver 2_0 + Name: OpenColorIO -Version: 1.1.1 +Version: 2.0.1 Release: 0 Summary: Color Management Solution Geared Towards Motion Picture Production License: BSD-3-Clause AND GPL-2.0-or-later Group: Productivity/Graphics/Other URL: https://opencolorio.org/ -###### -###### -# The package contains the below non OSS licensed files (see bnc#821203) -# -# ext/Pygments-1.6/tests/examplefiles/Sorting.mod -# ext/Pygments-1.6/tests/examplefiles/test.mod -# -# so a crippled tarball is used with these files removed. Steps to reproduce: -# -# tar zxf OpenColorIO-%%{version}.tar.gz -# pushd OpenColorIO-%%{version}/ext/ -# tar zxf Pygments-1.6.tar.gz -# rm -f Pygments-1.6.tar.gz -# rm -f Pygments-1.6/tests/examplefiles/{Sorting.mod,test.mod} -# tar zcf Pygments-1.6.tar.gz Pygments-1.6/ -# rm -rf Pygments-1.6/ -# popd -# tar zcf OpenColorIO-%%{version}-crippled.tar.gz OpenColorIO-%%{version}/ -# rm -f OpenColorIO-%%{version}.tar.gz -# -# NOTE: In newer OpenColorIO versions, Pygments (version 1.6) maybe updated. -# In this case check if the above files' license is changed, so no crippled tarball is needed. -##### -##### -Source0: %{name}-%{version}-crippled.tar.gz -# PATCH-FIX-UPSTREAM OpenColorIO-setuptools.patch [email protected] -- Use external python-setuptools for building (taken from Fedora) -Patch0: OpenColorIO-setuptools.patch -# PATCH-FIX-UPSTREAM 0003-Fix_Linux_compilation.patch [email protected] -- Fix Linux compilation (taken from Debian) -Patch1: 0003-Fix_Linux_compilation.patch -# PATCH-FIX-UPSTREAM 0004-Fix_build_with_GCC-8.patch [email protected] -- Fix build with GCC-8 (taken from Debian) -Patch2: 0004-Fix_build_with_GCC-8.patch -# PATCH-FIX-UPSTREAM 0005-Fix_build_with_yaml-cpp0.6.patch [email protected] -- Fix build with yaml-cpp0.6 (taken from Debian) -Patch3: 0005-Fix_build_with_yaml-cpp0.6.patch -BuildRequires: cmake +Source0: %{name}-%{version}.tar.gz +BuildRequires: OpenImageIO >= 2.1.9 +BuildRequires: OpenImageIO-devel >= 2.1.9 +BuildRequires: cmake >= 3.12 +BuildRequires: doxygen BuildRequires: gcc-c++ +BuildRequires: ilmbase-devel >= 2.4.0 BuildRequires: libboost_headers-devel -BuildRequires: liblcms2-devel +BuildRequires: libexpat-devel >= 2.2.8 +BuildRequires: liblcms2-devel >= 2.2 +BuildRequires: openexr-devel BuildRequires: pkgconfig +BuildRequires: pystring-devel >= 1.1.3 BuildRequires: python3-MarkupSafe +BuildRequires: python3-Sphinx +BuildRequires: python3-breathe BuildRequires: python3-devel +BuildRequires: python3-pybind11-devel +BuildRequires: python3-recommonmark BuildRequires: python3-setuptools -BuildRequires: tinyxml-devel -BuildRequires: pkgconfig(yaml-cpp) >= 0.5.0 +BuildRequires: python3-sphinx-tabs +BuildRequires: python3-sphinx_press_theme +BuildRequires: python3-testresources +BuildRequires: yaml-cpp-devel >= 0.6.3 Recommends: %{name}-doc = %{version} %description @@ -110,87 +91,65 @@ OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats. -%package -n python-OpenColorIO +%package -n python3-OpenColorIO Summary: Python Bindings for OpenColorIO Group: Development/Libraries/Python +# python-OpenColorIO was last used at version 1.1.1 +Provides: python-OpenColorIO = %{version} +Obsoletes: python-OpenColorIO < %{version} -%description -n python-OpenColorIO +%description -n python3-OpenColorIO This package contains python bindings for OpenColorIO. -%package -n python-OpenColorIO-devel -Summary: Python Bindings for OpenColorIO -Group: Development/Libraries/Python -Requires: python-OpenColorIO = %{version} -Requires: python3-devel - -%description -n python-OpenColorIO-devel -This package contains development files for python bindings for OpenColorIO. - %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -# Make sure that bundled libraries are not used -rm -f ext/lcms* -rm -f ext/tinyxml* -rm -f ext/yaml* + +# Fix 64bit library install location +%ifarch x86_64 +sed -i 's|DESTINATION lib|DESTINATION %_lib|' src/OpenColorIO/CMakeLists.txt +%endif %build %cmake \ - -DPYTHON=%{_bindir}/python3 \ - -DOCIO_BUILD_STATIC=OFF \ - -DOCIO_BUILD_DOCS=ON \ - -DOCIO_BUILD_TESTS=ON \ - -DOCIO_PYGLUE_LINK=ON \ %ifnarch x86_64 -DOCIO_USE_SSE=OFF \ %endif - -DUSE_EXTERNAL_YAML=ON \ - -DUSE_EXTERNAL_TINYXML=ON \ - -DUSE_EXTERNAL_LCMS=ON \ - -DUSE_EXTERNAL_SETUPTOOLS=ON + -DOCIO_BUILD_DOCS=ON %cmake_build %install %cmake_install +# Remove stray static lib +rm %{buildroot}/usr/lib/libOpenColorIOoiiohelpers.a + # Move documentation to the right location mkdir -p %{buildroot}%{_docdir}/%{name} mv %{buildroot}%{_datadir}/doc/OpenColorIO/html/ %{buildroot}%{_docdir}/%{name}/ - -# Move cmake files to the right location -mkdir -p %{buildroot}%{_datadir}/cmake/Modules -mv %{buildroot}%{_prefix}/*.cmake %{buildroot}%{_prefix}/cmake/*.cmake %{buildroot}%{_datadir}/cmake/Modules/ +rmdir %{buildroot}%{_datadir}/doc/OpenColorIO %post -n libOpenColorIO%{so_ver} -p /sbin/ldconfig %postun -n libOpenColorIO%{so_ver} -p /sbin/ldconfig %files %license LICENSE -%doc ChangeLog README.md +%doc *.md %exclude %{_docdir}/%{name}/html/ %{_bindir}/* %{_datadir}/ocio/ %files devel -%{_datadir}/cmake/Modules/* %{_includedir}/OpenColorIO/ %{_libdir}/pkgconfig/OpenColorIO.pc -%{_libdir}/*.so +%{_libdir}/libOpenColorIO.so %files doc %{_docdir}/%{name}/html/ %files -n libOpenColorIO%{so_ver} -%{_libdir}/libOpenColorIO.so.%{so_ver}* +%{_libdir}/libOpenColorIO.so.* -%files -n python-OpenColorIO +%files -n python3-OpenColorIO %{python3_sitearch}/PyOpenColorIO.so -%files -n python-OpenColorIO-devel -%{_includedir}/PyOpenColorIO/ - %changelog ++++++ OpenColorIO-1.1.1-crippled.tar.gz -> OpenColorIO-2.0.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/OpenColorIO/OpenColorIO-1.1.1-crippled.tar.gz /work/SRC/openSUSE:Factory/.OpenColorIO.new.1899/OpenColorIO-2.0.1.tar.gz differ: char 12, line 1
