[ilmbase/f18: 2/3] Revert "Revert "ilmbase-1.0.3""

[Rex Dieter]

commit 89cdb5c3748e3d9b1afdd071cbca425afc76860a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 28 09:18:19 2012 -0500

    Revert "Revert "ilmbase-1.0.3""
    
    This reverts commit 0386394f3075ad1bb2f574eed9059bcb2c3fc245.

 .gitignore                  |    7 +++----
 ilmbase-1.0.2-cstring.patch |   11 -----------
 ilmbase-1.0.3-so6.patch     |   12 ++++++++++++
 ilmbase.spec                |   28 +++++++++++++---------------
 sources                     |    3 +--
 5 files changed, 29 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 448204f..3b0738b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-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
+/ilmbase-1.0.2.tar.gz
+/ilmbase-1.0.2.tar.gz.sig
+/ilmbase-1.0.3.tar.gz
diff --git a/ilmbase-1.0.3-so6.patch b/ilmbase-1.0.3-so6.patch
new file mode 100644
index 0000000..d66bee1
--- /dev/null
+++ b/ilmbase-1.0.3-so6.patch
@@ -0,0 +1,12 @@
+diff -up ilmbase-1.0.3/configure.ac.so6 ilmbase-1.0.3/configure.ac
+--- ilmbase-1.0.3/configure.ac.so6	2012-07-30 17:06:57.000000000 -0500
++++ ilmbase-1.0.3/configure.ac	2012-08-05 21:22:35.519448537 -0500
+@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE(1.6.3)  dnl Require aut
+ AM_MAINTAINER_MODE
+ 
+ 
+-LIBTOOL_CURRENT=7
++LIBTOOL_CURRENT=6
+ LIBTOOL_REVISION=0
+ LIBTOOL_AGE=0
+ LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
diff --git a/ilmbase.spec b/ilmbase.spec
index 45eafc3..330e8a9 100644
--- a/ilmbase.spec
+++ b/ilmbase.spec
@@ -1,22 +1,21 @@
 
 Name:	 ilmbase 
-Version: 1.0.2
-Release: 5%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 Summary: Abstraction/convenience libraries
 
 Group:	 System Environment/Libraries
 License: BSD
 URL:	 http://www.openexr.com/
-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
+Source0: https://github.com/downloads/openexr/openexr/ilmbase-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires: automake libtool
+BuildRequires: automake libtool
 BuildRequires: pkgconfig
 
 ## upstreamable patches
-# missing #include <cstring>
-Patch50: ilmbase-1.0.2-cstring.patch
+# revert soname bump (for now)
+Patch50: ilmbase-1.0.3-so6.patch
 # explicitly add $(PTHREAD_LIBS) to libIlmThread linkage (helps workaround below)
 Patch51: ilmbase-1.0.2-no_undefined.patch
 
@@ -44,8 +43,9 @@ Requires: pkgconfig
 %prep
 %setup -q
 
-%patch50 -p1 -b .cstring
+%patch50 -p1 -b .so6
 %patch51 -p1 -b .no_undefined
+./bootstrap
 
 
 %build
@@ -67,11 +67,7 @@ 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}"
-%ifarch %{ix86}
-make check ||:
-%else
-make check
-%endif
+make check 
 
 
 %clean
@@ -79,15 +75,14 @@ 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*
 
@@ -99,6 +94,9 @@ 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 47d4f35..f911b6e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-26c133ee8ca48e1196fbfb3ffe292ab4  ilmbase-1.0.2.tar.gz
-f1c23889db53c6b89bf1c7fdf26da3d6  ilmbase-1.0.2.tar.gz.sig
+d99962ec7e2bfac0647aaabf6b91d5de  ilmbase-1.0.3.tar.gz