[OpenEXR_CTL] 1.0.1-18

[Rex Dieter]

commit 22d3df9fa90f03076a03e5a4d28ad2f944550e94
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 15:08:09 2014 -0600

    1.0.1-18
    
    - fix build against newer ilmbase/OpenEXR
    - use arch'd -libs dep in main/-devel subpkgs

 OpenEXR_CTL.spec                  |   16 +++++++++++++---
 openexr_ctl-1.0.1-namespace.patch |   16 ++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/OpenEXR_CTL.spec b/OpenEXR_CTL.spec
index 900536d..6281b86 100644
--- a/OpenEXR_CTL.spec
+++ b/OpenEXR_CTL.spec
@@ -1,6 +1,6 @@
 Name:           OpenEXR_CTL
 Version:        1.0.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        A simplified OpenEXR interface to CTL
 
 Group:          System Environment/Libraries
@@ -11,13 +11,15 @@ Patch0:         openexr_ctl-1.0.1-gcc43.patch
 Patch1:         openexr_ctl-1.0.1-pkgconfig.patch
 Patch2:         openexr_ctl-1.0.1-configure_gcc43.patch
 Patch3:         openexr_ctl-1.0.1-gcc44.patch
+# Fix build with newer ilmbase/OpenEXR
+Patch4:         openexr_ctl-1.0.1-namespace.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  libtool
 BuildRequires:  CTL-devel
 BuildRequires:  OpenEXR-devel
 
-
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 IlmImfCtl provides a simplified OpenEXR interface to CTL
@@ -42,7 +44,7 @@ The %{name}-libs package contains library for %{name}.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       OpenEXR-devel
 Requires:       CTL-devel
 
@@ -58,6 +60,10 @@ developing applications that use %{name}.
 %patch1 -p1 -b .pkgconfig
 %patch2 -p1 -b .conf_gcc43
 %patch3 -p1 -b .gcc44
+%if 0%{?fedora} > 20
+%patch4 -p1 -b .namespace
+%endif
+
 # Needed to disable rpath from configure
 #autoreconf
 
@@ -109,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 02 2014 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-18
+- fix build against newer ilmbase/OpenEXR
+- use arch'd -libs dep in main/-devel subpkgs
+
 * Sun Sep 08 2013 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-17
 - rebuild (OpenEXR)
 
diff --git a/openexr_ctl-1.0.1-namespace.patch b/openexr_ctl-1.0.1-namespace.patch
new file mode 100644
index 0000000..00f3b22
--- /dev/null
+++ b/openexr_ctl-1.0.1-namespace.patch
@@ -0,0 +1,16 @@
+diff -up openexr_ctl-1.0.1/IlmImfCtl/ImfCtlApplyTransforms.h.namespace openexr_ctl-1.0.1/IlmImfCtl/ImfCtlApplyTransforms.h
+--- openexr_ctl-1.0.1/IlmImfCtl/ImfCtlApplyTransforms.h.namespace	2007-07-24 17:28:03.000000000 -0500
++++ openexr_ctl-1.0.1/IlmImfCtl/ImfCtlApplyTransforms.h	2014-02-02 14:52:26.805915342 -0600
+@@ -187,11 +187,7 @@
+ #include <ImathBox.h>
+ #include <ImfThreading.h>
+ 
+-namespace Imf
+-{
+-    class Header;
+-    class FrameBuffer;
+-}
++#include <ImfForward.h>
+ 
+ namespace Ctl
+ {