[OpenEXR/f18] Revert "Update to 1.7.1"

Mon Aug 27 19:17:31 UTC 2012

commit 1b6145f28a8460816f613dd9be72757f02329d84
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 14:20:45 2012 -0500

    Revert "Update to 1.7.1"
    
    This reverts commit 24b8d295dabfd75d592a0f9159927ff8d783e335.
    
    Go back to safer known-quantiy 1.7.0 release, until the mess with
    the new release and ilmbase-1.0.3 is sorted out upstream

 .gitignore                    |    1 -
 OpenEXR-1.6.1-pkgconfig.patch |   13 ++++++++++++
 OpenEXR.spec                  |   42 ++++++++++++++++++++++++++--------------
 openexr-1.7.0-cstring.patch   |   11 ++++++++++
 openexr-1.7.1-so6.patch       |   12 -----------
 sources                       |    3 +-
 6 files changed, 53 insertions(+), 29 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3c872ab..6e23733 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 openexr-1.7.0.tar.gz
 openexr-1.7.0.tar.gz.sig
-/openexr-1.7.1.tar.gz
diff --git a/OpenEXR-1.6.1-pkgconfig.patch b/OpenEXR-1.6.1-pkgconfig.patch
new file mode 100644
index 0000000..4fc93e0
--- /dev/null
+++ b/OpenEXR-1.6.1-pkgconfig.patch
@@ -0,0 +1,13 @@
+diff -up openexr-1.6.1/OpenEXR.pc.in.pkgconfig openexr-1.6.1/OpenEXR.pc.in
+--- openexr-1.6.1/OpenEXR.pc.in.pkgconfig	2007-03-30 12:14:05.000000000 -0500
++++ openexr-1.6.1/OpenEXR.pc.in	2008-01-09 10:08:53.000000000 -0600
+@@ -7,5 +7,7 @@ OpenEXR_includedir=@includedir@/OpenEXR
+ Name: OpenEXR
+ Description: OpenEXR image library
+ Version: @OPENEXR_VERSION@
+-Libs: -L${libdir} @ILMBASE_LDFLAGS@ -lIlmImf -lz @ILMBASE_LIBS@
+-Cflags: @ILMBASE_CXXFLAGS@ -I${OpenEXR_includedir}
++Requires: IlmBase
++Libs: -L${libdir} -lIlmImf
++Libs.private: -lz
++Cflags: -I${OpenEXR_includedir}
diff --git a/OpenEXR.spec b/OpenEXR.spec
index bea2022..98baa64 100644
--- a/OpenEXR.spec
+++ b/OpenEXR.spec
@@ -1,20 +1,27 @@
 
 
 Name:	 OpenEXR
-Version: 1.7.1
-Release: 1%{?dist}
+Version: 1.7.0
+Release: 5%{?dist}
 Summary: A high dynamic-range (HDR) image file format
 
 Group:	 System Environment/Libraries
 License: BSD
 URL:	 http://www.openexr.com/
-Source0: https://github.com/downloads/openexr/openexr/openexr-%{version}.tar.gz
-Patch0: openexr-1.7.1-so6.patch
+Source0: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz
+Source1: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: openexr < %{version}-%{release}
 Provides:  openexr = %{version}-%{release}
 
+## upstreamable patches
+Patch50: OpenEXR-1.6.1-pkgconfig.patch
+# missing #include <cstring>
+Patch51: openexr-1.7.0-cstring.patch
+
+## upstream patches
+
 BuildRequires:  automake libtool
 BuildRequires:  ilmbase-devel 
 BuildRequires:  zlib-devel
@@ -47,9 +54,11 @@ Group:   System Environment/Libraries
 
 %prep
 %setup -q -n openexr-%{version}
-%patch0 -p1 -b .so6
 
-%if 1
+%patch50 -p1 -b .pkgconfig
+%patch51 -p1 -b .cstring
+
+%if 0
 # work to remove rpaths, recheck on new releases
 aclocal -Im4
 libtoolize --force
@@ -70,16 +79,22 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT
 
-#unpackaged files
+# unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
+
 
 %check
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion OpenEXR)" = "%{version}"
-#make check 
+#make check
 
 
 %clean
@@ -111,11 +126,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.7.1-1
-- Update to 1.7.1
-
--* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-5
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-4
 - Rebuilt for c++ ABI breakage
diff --git a/openexr-1.7.0-cstring.patch b/openexr-1.7.0-cstring.patch
new file mode 100644
index 0000000..f861321
--- /dev/null
+++ b/openexr-1.7.0-cstring.patch
@@ -0,0 +1,11 @@
+diff -up openexr-1.7.0/exrenvmap/blurImage.cpp.cstring openexr-1.7.0/exrenvmap/blurImage.cpp
+--- openexr-1.7.0/exrenvmap/blurImage.cpp.cstring	2009-02-25 17:39:27.000000000 -0600
++++ openexr-1.7.0/exrenvmap/blurImage.cpp	2010-07-28 10:22:38.972704975 -0500
+@@ -43,6 +43,7 @@
+ 
+ #include <resizeImage.h>
+ #include "Iex.h"
++#include <cstring>
+ #include <iostream>
+ #include <algorithm>
+ 
diff --git a/sources b/sources
index e36254b..4c8b019 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-a9e0369dfd68941c50cdaa93e9d7a8d1  openexr-1.7.1.tar.gz
+27113284f7d26a58f853c346e0851d7a  openexr-1.7.0.tar.gz
+1ffd9feb14c373ebae68228b0495ada0  openexr-1.7.0.tar.gz.sig
