Add python-markupsafe for document generation.

Fixes BZ#1038860.

OpenColorIO-yaml_cpp3.patch

@@ -1,24 +0,0 @@
-diff -Naur OpenColorIO-1.0.9.orig/CMakeLists.txt OpenColorIO-1.0.9/CMakeLists.txt
---- OpenColorIO-1.0.9.orig/CMakeLists.txt	2013-10-08 17:59:34.000000000 -0500
-+++ OpenColorIO-1.0.9/CMakeLists.txt	2013-11-05 21:20:11.824239166 -0600
-@@ -190,7 +190,7 @@
-     # Set minimum yaml version for non-patched sources.
-     set(YAML_VERSION_MIN "0.3.0")
-     include(FindPkgConfig)
--    pkg_check_modules(YAML_CPP yaml-cpp)
-+    pkg_search_module(YAML_CPP yaml-cpp yaml-cpp03)
-     if(YAML_CPP_FOUND)
-         if(YAML_CPP_VERSION VERSION_EQUAL ${YAML_VERSION_MIN} OR
-            YAML_CPP_VERSION VERSION_GREATER ${YAML_VERSION_MIN})
-diff -Naur OpenColorIO-1.0.9.orig/src/core/OCIOYaml.h OpenColorIO-1.0.9/src/core/OCIOYaml.h
---- OpenColorIO-1.0.9.orig/src/core/OCIOYaml.h	2013-10-08 17:59:34.000000000 -0500
-+++ OpenColorIO-1.0.9/src/core/OCIOYaml.h	2013-11-05 21:19:23.989303122 -0600
-@@ -68,7 +68,7 @@
- 
- #endif 
- 
--#include <yaml-cpp/yaml.h>
-+#include <yaml-cpp03/yaml.h>
- 
- #ifndef INCLUDED_OCIO_YAML_H
- #define INCLUDED_OCIO_YAML_H

OpenColorIO.spec

@@ -11,24 +11,28 @@
 
 Name:           OpenColorIO
 Version:        1.0.9
-Release:        1%{?dist}
+Release:        2%{?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.8
+# https://github.com/imageworks/OpenColorIO/tarball/v1.0.9
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         OpenColorIO-yaml_cpp3.patch
 
 # Utilities
 %if 0%{?el6}
 BuildRequires:  cmake28
+BuildRequires:  python-markupsafe
 %else
 BuildRequires:  cmake
 %endif
 BuildRequires:  help2man
-BuildRequires:  python-markupsafe
+
+# WARNING: OpenColorIO and OpenImageIO are cross dependent.
+# If an ABI incompatible update is done in one, the other also needs to be
+# rebuilt.
+BuildRequires:  OpenImageIO-devel
 
 # Libraries
 BuildRequires:  python-devel
@@ -43,9 +47,9 @@ BuildRequires:  zlib-devel
 #######################
 BuildRequires:  tinyxml-devel
 BuildRequires:  lcms2-devel
-BuildRequires:  yaml-cpp03-devel >= 0.3.0
+BuildRequires:  yaml-cpp-devel >= 0.3.0
 
-# The following bundled projects  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
@@ -60,6 +64,14 @@ solutions, OCIO is geared towards motion-picture post production, with an
 emphasis on visual effects and animation color pipelines.
 
 
+%package tools
+Summary:        Command line tools for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description tools
+Command line tools for %{name}.
+
+
 %package doc
 BuildArch:      noarch
 Summary:        API Documentation for %{name}
@@ -81,7 +93,6 @@ Development libraries and headers for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .yaml3
 
 # Remove what bundled libraries
 rm -f ext/lcms*
@@ -136,13 +147,15 @@ mv %{buildroot}%{_docdir}/%{name}/* _tmpdoc/
 
 %files
 %doc ChangeLog LICENSE README
-%{_bindir}/*
 %{_libdir}/*.so.*
 %dir %{_datadir}/ocio
 %{_datadir}/ocio/setup_ocio.sh
-%{_mandir}/man1/*
 %{python_sitearch}/*.so
 
+%files tools
+%{_bindir}/*
+%{_mandir}/man1/*
+
 %files doc
 %doc _tmpdoc/*
 
@@ -154,6 +167,10 @@ mv %{buildroot}%{_docdir}/%{name}/* _tmpdoc/
 
 
 %changelog
+* Mon Jan 13 2014 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-2
+- Add OpenImageIO as build requirement to build additional command line tools.
+  Fixes BZ#1038860.
+
 * Wed Nov  6 2013 Richard Shaw <hobbes1069@gmail.com> - 1.0.9-1
 - Update to latest upstream release.