[OpenImageIO] Add patch for tbb includes.

Richard Shaw hobbes1069 at fedoraproject.org
Sun Mar 4 23:10:20 UTC 2012


commit 464b352c9034d1822a5c81c11ba39cea83954a4b
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Sun Mar 4 17:10:14 2012 -0600

    Add patch for tbb includes.

 OpenImageIO.spec |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index d23d5a9..365f8ce 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -14,6 +14,7 @@ Source0:        https://download.github.com/%{name}-oiio-Release-%{version}-0-%{
 Source1:        FindTBB.cmake
 
 Patch0:         OpenImageIO-1.0.0-use_external_tbb.patch
+Patch1:         OpenImageIO-1.0.0-tbb_include.patch
 
 BuildRequires:  boost-devel glew-devel qt-devel OpenEXR-devel ilmbase-devel
 BuildRequires:  python2-devel txt2man
@@ -55,7 +56,8 @@ Development files for package %{name}
 
 %prep
 %setup -q -n %{name}-oiio-%{githash2}
-%patch0 -p1 -b .tbb
+%patch0 -p1 -b .exttbb
+%patch1 -p1 -b .tbbinc
 
 # Remove bundled pugixml
 rm -f src/include/pugixml.hpp \
@@ -120,12 +122,6 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 * Fri Mar 02 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.0-1
 - Update to latest upstream release.
 
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.4-3
-- Rebuilt for c++ ABI breakage
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Thu Jan 05 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.10.4-1
 - Update to 0.10.4.
 - Rebuild for GCC 4.7.0.


More information about the scm-commits mailing list