From 0c7bd0c4d492e10c49962af7e3e937e11a789b7e Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 13 Oct 2010 05:07:06 +0000
Subject: [PATCH] - updated to 1.7.0 - old gcc4 patch obsolete, added new one

Changed files:
    OpenEXR-gcc4.patch -> 1.3
    OpenEXR.spec -> 1.27
    gcc4.patch -> 1.2
---
 OpenEXR-gcc4.patch | 10 ++++++++++
 OpenEXR.spec       | 17 ++++++++++-------
 gcc4.patch         | 20 --------------------
 3 files changed, 20 insertions(+), 27 deletions(-)
 create mode 100644 OpenEXR-gcc4.patch
 delete mode 100644 gcc4.patch

diff --git a/OpenEXR-gcc4.patch b/OpenEXR-gcc4.patch
new file mode 100644
index 0000000..2356753
--- /dev/null
+++ b/OpenEXR-gcc4.patch
@@ -0,0 +1,10 @@
+--- openexr-1.7.0/exrenvmap/blurImage.cpp.orig	2009-02-26 00:39:27.000000000 +0100
++++ openexr-1.7.0/exrenvmap/blurImage.cpp	2010-10-12 21:56:11.687740205 +0200
+@@ -43,6 +43,7 @@
+ 
+ #include <resizeImage.h>
+ #include "Iex.h"
++#include <cstring>
+ #include <iostream>
+ #include <algorithm>
+ 
diff --git a/OpenEXR.spec b/OpenEXR.spec
index 4e6a8f7..d603bf0 100644
--- a/OpenEXR.spec
+++ b/OpenEXR.spec
@@ -1,22 +1,23 @@
 Summary:	High dynamic-range (HDR) image file format support libraries
 Summary(pl.UTF-8):	Biblioteki obsługujące format plików obrazu o wysokiej dynamice (HDR)
 Name:		OpenEXR
-Version:	1.6.1
-Release:	2
+Version:	1.7.0
+Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz
-# Source0-md5:	11951f164f9c872b183df75e66de145a
-Patch0:		gcc4.patch
+# Source0-md5:	27113284f7d26a58f853c346e0851d7a
+#Patch0:		gcc4.patch
+Patch0:		%{name}-gcc4.patch
 URL:		http://www.openexr.com/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1.6.3
-BuildRequires:	ilmbase-devel >= 1.0.1
+BuildRequires:	ilmbase-devel >= 1.0.2
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	zlib-devel
-Requires:	ilmbase >= 1.0.1
+Requires:	ilmbase >= 1.0.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,7 +42,7 @@ Summary:	Header files for OpenEXR libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek OpenEXR
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	ilmbase-devel >= 1.0.1
+Requires:	ilmbase-devel >= 1.0.2
 Requires:	libstdc++-devel
 Requires:	zlib-devel
 
@@ -121,8 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files progs
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/exr2aces
 %attr(755,root,root) %{_bindir}/exrenvmap
 %attr(755,root,root) %{_bindir}/exrheader
 %attr(755,root,root) %{_bindir}/exrmakepreview
 %attr(755,root,root) %{_bindir}/exrmaketiled
+%attr(755,root,root) %{_bindir}/exrmultiview
 %attr(755,root,root) %{_bindir}/exrstdattr
diff --git a/gcc4.patch b/gcc4.patch
deleted file mode 100644
index 14d06c6..0000000
--- a/gcc4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openexr-1.6.1/exrmaketiled/main.cpp.orig	2009-10-26 09:03:37.204979532 +0100
-+++ openexr-1.6.1/exrmaketiled/main.cpp	2009-10-26 09:04:06.202986564 +0100
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <string>
-+#include <cstring>
- #include <stdlib.h>
- 
- using namespace Imf;
---- openexr-1.6.1/exrenvmap/main.cpp.orig	2009-10-26 09:54:33.994893321 +0100
-+++ openexr-1.6.1/exrenvmap/main.cpp	2009-10-26 09:54:51.493690669 +0100
-@@ -43,6 +43,7 @@
- #include <makeLatLongMap.h>
- #include <ImfEnvmap.h>
- #include <iostream>
-+#include <cstring>
- #include <exception>
- #include <stdlib.h>
- 
-- 
2.43.0