From 2051691e94345434ec4dee7bb4f876e33b0f8fe8 Mon Sep 17 00:00:00 2001 From: Richard M. Shaw Date: Nov 05 2011 21:39:56 +0000 Subject: Update to 0.10.3 Rebuild for libpng 1.5. --- diff --git a/OpenImageIO.spec b/OpenImageIO.spec index b2e0c8e..de44f4f 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -1,6 +1,6 @@ Name: OpenImageIO Version: 0.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for reading and writing images Group: Development/Libraries @@ -18,7 +18,8 @@ BuildRequires: python2-devel txt2man BuildRequires: libpng libtiff-devel BuildRequires: zlib-devel jasper-devel BuildRequires: pugixml-devel -BuildRequires: tbb-devel +# Disable until it works properly +#BuildRequires: tbb-devel # Field3D support is not considered stable at this time and no package # currently exists for Fedora. Re-enable when fixed. #BuildRequires: hdf5-devel Field3D-devel @@ -56,7 +57,7 @@ Development files for package %{name} %setup -q -n %{name}-oiio-7d98ca6 %patch0 -p1 -b .backport %patch1 -p1 -b .atomic -%patch2 -p1 -b .tbb +#patch2 -p1 -b .tbb %patch3 -p1 -b .zlib # Remove bundled pugixml @@ -75,7 +76,7 @@ pushd build -DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \ -DINSTALL_DOCS:BOOL=OFF \ -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \ - -DUSE_TBB:BOOL=ON \ + -DUSE_TBB:BOOL=OFF \ ../src make %{?_smp_mflags} @@ -109,10 +110,9 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1 %changelog -* Sat Nov 05 2011 Richard Shaw - 0.10.3-1 +* Sat Nov 05 2011 Richard Shaw - 0.10.3-2 - Update to 0.10.3 - Rebuild for libpng 1.5. -- Fixed bulding against tbb library. * Thu Aug 27 2011 Tom Callaway - 0.10.2-1 - Update to 0.10.2