From 054dab7866f5bc201cebf80e4a295e4421b856a8 Mon Sep 17 00:00:00 2001
From: Richard M. Shaw <hobbes1069@gmail.com>
Date: May 20 2014 20:28:54 +0000
Subject: Update to latest upstream release.


---

diff --git a/.gitignore b/.gitignore
index 77803df..ec63af5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ clog
 /oiio-Release-1.2.1.tar.gz
 /oiio-Release-1.2.3.tar.gz
 /oiio-Release-1.3.11.tar.gz
+/oiio-Release-1.4.7.tar.gz
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 69f816d..7b0adcc 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,9 +1,11 @@
+%global subname oiio
+
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %global cmake %cmake28
 %endif
 
 Name:           OpenImageIO
-Version:        1.3.11
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Library for reading and writing images
 
@@ -11,7 +13,7 @@ Group:          Development/Libraries
 License:        BSD
 URL:            https://sites.google.com/site/openimageio/home
 
-Source0:        https://download.github.com/oiio-Release-%{version}.tar.gz
+Source0:        https://github.com/%{name}/%{subname}/archive/Release-%{version}/%{subname}-Release-%{version}.tar.gz
 # Images for test suite
 #Source1:        oiio-images.tar.gz
 
@@ -19,6 +21,7 @@ Patch0:         oiio-arm.patch
 Patch1:         oiio-ppc.patch
 Patch2:         oiio-s390.patch
 Patch3:         oiio-cmake.patch
+Patch4:         oiio-size_t.patch
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:  cmake28
@@ -94,10 +97,11 @@ Development files for package %{name}
 
 %prep
 %setup -q -n oiio-Release-%{version}
-%patch0 -p1 -b .arm
-%patch1 -p1 -b .ppc
+#patch0 -p1 -b .arm
+#patch1 -p1 -b .ppc
 #patch2 -p1 -b .s390
 #patch3 -p1 -b .cmake
+%patch4 -p1 -b .size_t
 
 # Remove bundled pugixml
 rm -f src/include/pugixml.hpp \
@@ -153,6 +157,7 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 %files
 %doc CHANGES LICENSE
 %{_libdir}/libOpenImageIO.so.*
+%{_libdir}/libOpenImageIO_Util.so.*
 %{python_sitearch}/OpenImageIO.so
 
 %files utils
@@ -168,10 +173,14 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 %files devel
 %doc src/doc/*.pdf
 %{_libdir}/libOpenImageIO.so
+%{_libdir}/libOpenImageIO_Util.so
 %{_includedir}/*
 
 
 %changelog
+* Mon May 19 2014 Richard Shaw <hobbes1069@gmail.com> - 1.4.7-1
+- Update to latest upstream release.
+
 * Tue Jan  7 2014 Richard Shaw <hobbes1069@gmail.com> - 1.3.10-1
 - Update to latest upstream release.
 - Add libgif as build requirement.
diff --git a/oiio-size_t.patch b/oiio-size_t.patch
new file mode 100644
index 0000000..c2aa4c8
--- /dev/null
+++ b/oiio-size_t.patch
@@ -0,0 +1,12 @@
+diff -Naur oiio-Release-1.4.7.orig/src/dpx.imageio/libdpx/Writer.cpp oiio-Release-1.4.7/src/dpx.imageio/libdpx/Writer.cpp
+--- oiio-Release-1.4.7.orig/src/dpx.imageio/libdpx/Writer.cpp	2014-05-19 15:20:32.000000000 -0500
++++ oiio-Release-1.4.7/src/dpx.imageio/libdpx/Writer.cpp	2014-05-20 07:04:17.940464785 -0500
+@@ -140,7 +140,7 @@
+ 
+ bool dpx::Writer::WriteUserData(void *data)
+ {
+-    long size = this->header.UserSize();
++    size_t size = this->header.UserSize();
+ 	if (fd->Write(data, size) != size)
+ 		return false;
+     this->fileLoc += size;
diff --git a/sources b/sources
index cff42b5..6879744 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1b6b4cbc863fa49259d0f32da4288d7  oiio-Release-1.3.11.tar.gz
+098ed75608f4c0e20370b788280c8a26  oiio-Release-1.4.7.tar.gz