From ac9eb47baf8e483124cf362c389d62e12954edbb Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Tue, 11 Dec 2012 19:32:20 -0600 Subject: [PATCH] Update to latest upstream release. --- .gitignore | 1 + OpenColorIO-1.0.7-docfix.patch | 13 ------- OpenColorIO-1.0.7-pylib_no_soname.patch | 23 ------------ OpenColorIO.spec | 48 +++++++++++-------------- sources | 2 +- 5 files changed, 22 insertions(+), 65 deletions(-) delete mode 100644 OpenColorIO-1.0.7-docfix.patch delete mode 100644 OpenColorIO-1.0.7-pylib_no_soname.patch diff --git a/.gitignore b/.gitignore index 4546d94..cf44cfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /imageworks-OpenColorIO-v1.0.7-0-g87da508.tar.gz +/OpenColorIO-1.0.8.tar.gz diff --git a/OpenColorIO-1.0.7-docfix.patch b/OpenColorIO-1.0.7-docfix.patch deleted file mode 100644 index 7319b11..0000000 --- a/OpenColorIO-1.0.7-docfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur imageworks-OpenColorIO-b3cb224.orig/docs/CMakeLists.txt imageworks-OpenColorIO-b3cb224/docs/CMakeLists.txt ---- imageworks-OpenColorIO-b3cb224.orig/docs/CMakeLists.txt 2012-04-17 19:08:16.000000000 -0500 -+++ imageworks-OpenColorIO-b3cb224/docs/CMakeLists.txt 2012-04-18 11:18:06.026781578 -0500 -@@ -99,7 +99,8 @@ - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/ - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html -- PATTERN .git EXCLUDE) -+ PATTERN .* EXCLUDE -+) - - find_package(LATEX) - if(PDFLATEX_COMPILER) diff --git a/OpenColorIO-1.0.7-pylib_no_soname.patch b/OpenColorIO-1.0.7-pylib_no_soname.patch deleted file mode 100644 index f695f9e..0000000 --- a/OpenColorIO-1.0.7-pylib_no_soname.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur imageworks-OpenColorIO-b3cb224.orig/CMakeLists.txt imageworks-OpenColorIO-b3cb224/CMakeLists.txt ---- imageworks-OpenColorIO-b3cb224.orig/CMakeLists.txt 2012-04-17 19:08:16.000000000 -0500 -+++ imageworks-OpenColorIO-b3cb224/CMakeLists.txt 2012-04-23 21:24:37.571876995 -0500 -@@ -28,6 +28,7 @@ - option(OCIO_USE_BOOST_PTR "Set to ON to enable boost shared_ptr (necessary when tr1 is not available)" OFF) - - option(OCIO_PYGLUE_RESPECT_ABI "If ON, the Python module install path includes Python UCS version" OFF) -+option(OCIO_PYGLUE_SONAME "If ON, soname/soversion will be set for Python module libraries." OFF) - if(UNIX AND NOT APPLE) - option(USE_EXTERNAL_YAML "Use system installed yaml-cpp library." OFF) - option(USE_EXTERNAL_TINYXML "Use system installed tinyxml library." OFF) -diff -Naur imageworks-OpenColorIO-b3cb224.orig/src/pyglue/CMakeLists.txt imageworks-OpenColorIO-b3cb224/src/pyglue/CMakeLists.txt ---- imageworks-OpenColorIO-b3cb224.orig/src/pyglue/CMakeLists.txt 2012-04-17 19:08:16.000000000 -0500 -+++ imageworks-OpenColorIO-b3cb224/src/pyglue/CMakeLists.txt 2012-04-23 21:22:20.857218546 -0500 -@@ -92,7 +92,7 @@ - # We should explore whether this should be built as a normal dylib, instead - # of as a bundle. See https://github.com/imageworks/OpenColorIO/pull/175 - --if(NOT APPLE) -+if(OCIO_PYGLUE_SONAME) - message(STATUS "Setting PyOCIO SOVERSION to: ${SOVERSION}") - set_target_properties(PyOpenColorIO PROPERTIES - VERSION ${OCIO_VERSION} diff --git a/OpenColorIO.spec b/OpenColorIO.spec index 4f3255f..578c762 100644 --- a/OpenColorIO.spec +++ b/OpenColorIO.spec @@ -1,6 +1,3 @@ -%global githash1 g87da508 -%global githash2 b3cb224 - # Filter provides from Python libraries %{?filter_setup: %filter_provides_in %{python_sitearch}.*\.so$ @@ -13,18 +10,15 @@ %endif Name: OpenColorIO -Version: 1.0.7 -Release: 5%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: Enables color transforms and image display across graphics apps License: BSD URL: http://opencolorio.org/ # Github archive was generated on the fly using the following URL: -# https://github.com/imageworks/OpenColorIO/tarball/v1.0.7 -Source0: imageworks-%{name}-v%{version}-0-%{githash1}.tar.gz - -Patch0: OpenColorIO-1.0.7-pylib_no_soname.patch -Patch1: OpenColorIO-1.0.7-docfix.patch +# https://github.com/imageworks/OpenColorIO/tarball/v1.0.8 +Source0: %{name}-%{version}.tar.gz # Utilities %if 0%{?el6} @@ -49,7 +43,7 @@ BuildRequires: tinyxml-devel BuildRequires: lcms2-devel BuildRequires: yaml-cpp-devel >= 0.3.0 -# The following are only used for document generation. +# The following bundled projects are only used for document generation. #BuildRequires: python-docutils #BuildRequires: python-jinja2 #BuildRequires: python-pygments @@ -84,12 +78,7 @@ Development libraries and headers for %{name}. %prep -%setup -q -n imageworks-%{name}-%{githash2} -# Dot set soname for python modules. -%patch0 -p1 -b .pylib -# Exclude hidden files from being packaged. -%patch1 -p1 -b .docfix - +%setup -q # Remove what bundled libraries rm -f ext/lcms* @@ -99,19 +88,19 @@ rm -f ext/yaml* %build rm -rf build && mkdir build && pushd build -%cmake -DOCIO_BUILD_STATIC=OFF \ - -DPYTHON_INCLUDE_LIB_PREFIX=OFF \ - -DOCIO_BUILD_DOCS=ON \ - -DOCIO_BUILD_TESTS=ON \ - -DOCIO_LINK_PYGLUE=ON \ - -DOCIO_PYGLUE_SONAME=OFF \ - -DUSE_EXTERNAL_YAML=TRUE \ - -DUSE_EXTERNAL_TINYXML=TRUE \ - -DUSE_EXTERNAL_LCMS=TRUE \ +%cmake -DOCIO_BUILD_STATIC=OFF \ + -DPYTHON_INCLUDE_LIB_PREFIX=OFF \ + -DOCIO_BUILD_DOCS=ON \ + -DOCIO_BUILD_TESTS=ON \ + -DOCIO_LINK_PYGLUE=ON \ + -DOCIO_PYGLUE_SONAME=OFF \ + -DUSE_EXTERNAL_YAML=TRUE \ + -DUSE_EXTERNAL_TINYXML=TRUE \ + -DUSE_EXTERNAL_LCMS=TRUE \ %ifnarch x86_64 - -DOCIO_USE_SSE=OFF \ + -DOCIO_USE_SSE=OFF \ %endif - ../ + ../ make %{?_smp_mflags} @@ -159,6 +148,9 @@ help2man -N -s 1 %{?fedora:--version-string=%{version}} \ %changelog +* Tue Dec 11 2012 Richard Shaw - 1.0.8-1 +- Update to latest upstream release. + * Wed Jul 18 2012 Fedora Release Engineering - 1.0.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 18c70c3..5a1659e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -824cc5e705a9fb8ee16dd360a457cafc imageworks-OpenColorIO-v1.0.7-0-g87da508.tar.gz +f9862c9abcb67755365a125b463c9c1f OpenColorIO-1.0.8.tar.gz