[ilmbase/f18] Revert "ilmbase-1.0.3"

[Rex Dieter]

commit 0386394f3075ad1bb2f574eed9059bcb2c3fc245
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 14:17:46 2012 -0500

    Revert "ilmbase-1.0.3"
    
    This reverts commit 30fcfff7d5963ba8e29d1121ec396410afb69ee2.
    
    build is busted on i686 with newer glibc, tracking at
    https://github.com/openexr/openexr/issues/3

 .gitignore                  |    7 ++++---
 ilmbase-1.0.2-cstring.patch |   11 +++++++++++
 ilmbase-1.0.3-so6.patch     |   12 ------------
 ilmbase.spec                |   28 +++++++++++++++-------------
 sources                     |    3 ++-
 5 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b0738b..448204f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-/ilmbase-1.0.2.tar.gz
-/ilmbase-1.0.2.tar.gz.sig
-/ilmbase-1.0.3.tar.gz
+ilmbase-1.0.1.tar.gz
+ilmbase-1.0.1.tar.gz.sig
+ilmbase-1.0.2.tar.gz
+ilmbase-1.0.2.tar.gz.sig
diff --git a/ilmbase-1.0.2-cstring.patch b/ilmbase-1.0.2-cstring.patch
new file mode 100644
index 0000000..63cfa24
--- /dev/null
+++ b/ilmbase-1.0.2-cstring.patch
@@ -0,0 +1,11 @@
+diff -up ilmbase-1.0.2/Imath/ImathMatrix.h.cstring ilmbase-1.0.2/Imath/ImathMatrix.h
+--- ilmbase-1.0.2/Imath/ImathMatrix.h.cstring	2010-07-16 17:48:40.000000000 -0500
++++ ilmbase-1.0.2/Imath/ImathMatrix.h	2010-07-28 09:49:44.528455468 -0500
+@@ -49,6 +49,7 @@
+ #include "ImathVec.h"
+ #include "ImathShear.h"
+ 
++#include <cstring>
+ #include <iostream>
+ #include <iomanip>
+ 
diff --git a/ilmbase.spec b/ilmbase.spec
index 330e8a9..45eafc3 100644
--- a/ilmbase.spec
+++ b/ilmbase.spec
@@ -1,21 +1,22 @@
 
 Name:	 ilmbase 
-Version: 1.0.3
-Release: 1%{?dist}
+Version: 1.0.2
+Release: 5%{?dist}
 Summary: Abstraction/convenience libraries
 
 Group:	 System Environment/Libraries
 License: BSD
 URL:	 http://www.openexr.com/
-Source0: https://github.com/downloads/openexr/openexr/ilmbase-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/openexr/ilmbase-%{version}.tar.gz
+Source1: http://download.savannah.nongnu.org/releases/openexr/ilmbase-%{version}.tar.gz.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: automake libtool
+#BuildRequires: automake libtool
 BuildRequires: pkgconfig
 
 ## upstreamable patches
-# revert soname bump (for now)
-Patch50: ilmbase-1.0.3-so6.patch
+# missing #include <cstring>
+Patch50: ilmbase-1.0.2-cstring.patch
 # explicitly add $(PTHREAD_LIBS) to libIlmThread linkage (helps workaround below)
 Patch51: ilmbase-1.0.2-no_undefined.patch
 
@@ -43,9 +44,8 @@ Requires: pkgconfig
 %prep
 %setup -q
 
-%patch50 -p1 -b .so6
+%patch50 -p1 -b .cstring
 %patch51 -p1 -b .no_undefined
-./bootstrap
 
 
 %build
@@ -67,7 +67,11 @@ rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %check
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion IlmBase)" = "%{version}"
-make check 
+%ifarch %{ix86}
+make check ||:
+%else
+make check
+%endif
 
 
 %clean
@@ -75,14 +79,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libHalf.so.6*
 %{_libdir}/libIex.so.6*
-%{_libdir}/libIexMath.so.6*
 %{_libdir}/libIlmThread.so.6*
 %{_libdir}/libImath.so.6*
 
@@ -94,9 +99,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Aug 05 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.3-1
-- ilmbase-1.0.3
-
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index f911b6e..47d4f35 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-d99962ec7e2bfac0647aaabf6b91d5de  ilmbase-1.0.3.tar.gz
+26c133ee8ca48e1196fbfb3ffe292ab4  ilmbase-1.0.2.tar.gz
+f1c23889db53c6b89bf1c7fdf26da3d6  ilmbase-1.0.2.tar.gz.sig