[ilmbase] 2.2.0

[Rex Dieter]

commit 6b7986fd2e4a694baf93d427ea8616818c26e88f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Nov 25 12:29:55 2014 -0600

    2.2.0

 .gitignore                                         |    1 +
 ilmbase-2.0-1-arm.patch                            |   12 -------
 ...fined.patch => ilmbase-2.2.0-no_undefined.patch |   14 ++++----
 ilmbase.spec                                       |   32 ++++++++++---------
 sources                                            |    2 +-
 5 files changed, 26 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60cdb8c..9627279 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /ilmbase-1.0.3.tar.gz
 /ilmbase-2.1.0.tar.gz
+/ilmbase-2.2.0.tar.gz
diff --git a/ilmbase-2.0.1-no_undefined.patch b/ilmbase-2.2.0-no_undefined.patch
similarity index 52%
rename from ilmbase-2.0.1-no_undefined.patch
rename to ilmbase-2.2.0-no_undefined.patch
index 87a35c9..d641907 100644
--- a/ilmbase-2.0.1-no_undefined.patch
+++ b/ilmbase-2.2.0-no_undefined.patch
@@ -1,6 +1,6 @@
-diff -up ilmbase-2.0.1/IlmThread/Makefile.am.no_undefined ilmbase-2.0.1/IlmThread/Makefile.am
---- ilmbase-2.0.1/IlmThread/Makefile.am.no_undefined	2013-06-18 14:51:38.000000000 -0500
-+++ ilmbase-2.0.1/IlmThread/Makefile.am	2013-08-28 21:04:25.793391766 -0500
+diff -up ilmbase-2.2.0/IlmThread/Makefile.am.no_undefined ilmbase-2.2.0/IlmThread/Makefile.am
+--- ilmbase-2.2.0/IlmThread/Makefile.am.no_undefined	2014-08-09 21:03:38.000000000 -0500
++++ ilmbase-2.2.0/IlmThread/Makefile.am	2014-11-20 07:44:27.913588030 -0600
 @@ -14,7 +14,7 @@ libIlmThread_la_LDFLAGS = -version-info
  if LIB_SUFFIX_EXISTS
  libIlmThread_la_LDFLAGS += -release @LIB_SUFFIX@
@@ -10,10 +10,10 @@ diff -up ilmbase-2.0.1/IlmThread/Makefile.am.no_undefined ilmbase-2.0.1/IlmThrea
  
  libIlmThreadincludedir = $(includedir)/OpenEXR
  
-diff -up ilmbase-2.0.1/IlmThread/Makefile.in.no_undefined ilmbase-2.0.1/IlmThread/Makefile.in
---- ilmbase-2.0.1/IlmThread/Makefile.in.no_undefined	2013-06-18 14:55:24.000000000 -0500
-+++ ilmbase-2.0.1/IlmThread/Makefile.in	2013-08-28 21:04:55.395049371 -0500
-@@ -253,7 +253,7 @@ libIlmThread_la_SOURCES = IlmThreadPool.
+diff -up ilmbase-2.2.0/IlmThread/Makefile.in.no_undefined ilmbase-2.2.0/IlmThread/Makefile.in
+--- ilmbase-2.2.0/IlmThread/Makefile.in.no_undefined	2014-08-09 23:37:24.000000000 -0500
++++ ilmbase-2.2.0/IlmThread/Makefile.in	2014-11-20 07:44:27.914587968 -0600
+@@ -251,7 +251,7 @@ libIlmThread_la_SOURCES = IlmThreadPool.
  
  libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
  	-no-undefined $(am__append_1)
diff --git a/ilmbase.spec b/ilmbase.spec
index cec4778..752cd8e 100644
--- a/ilmbase.spec
+++ b/ilmbase.spec
@@ -1,7 +1,8 @@
+
 Name:    ilmbase
-Version: 2.1.0
-Release: 3%{?dist}
 Summary: Abstraction/convenience libraries
+Version: 2.2.0
+Release: 1%{?dist}
 
 License: BSD
 URL:	 http://www.openexr.com/
@@ -14,12 +15,10 @@ BuildRequires: pkgconfig
 BuildRequires: pkgconfig(gl) pkgconfig(glu)
 
 ## upstreamable patches
-# explicitly add $(PTHREAD_LIBS) to libIlmThread linkage (helps workaround below)
-Patch51: ilmbase-2.0.1-no_undefined.patch
+# explicitly add $(PTHREAD_LIBS) to libIlmThread linkage (helps PTHREAD_LIBS workaround in %%build)
+Patch51: ilmbase-2.2.0-no_undefined.patch
 # add Requires.private: gl glu to IlmBase.pc
 Patch53:  ilmbase-1.0.3-pkgconfig.patch
-# use ucontext only on ix86/x86_64, avoid FTBFS on arm (patch borrowed from opensuse)
-Patch54: ilmbase-2.0-1-arm.patch
 
 ## upstream patches
 
@@ -46,7 +45,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %patch51 -p1 -b .no_undefined
 %patch53 -p1 -b .pkgconfig
-%patch54 -p1 -b .arm
 
 #/bootstrap
 
@@ -66,13 +64,14 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
 
 
 %check
-export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion IlmBase)" = "%{version}"
 # is the known-failure ix86-specific or 32bit specific? guess we'll find out -- rex
+# lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed.
 %ifarch %{ix86}
-make check ||:
+make %{?_smp_mflags} check ||:
 %else
-make check
+make %{?_smp_mflags} check
 %endif
 
 
@@ -81,11 +80,11 @@ make check
 
 %files
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/libHalf.so.11*
-%{_libdir}/libIex-2_1.so.11*
-%{_libdir}/libIexMath-2_1.so.11*
-%{_libdir}/libIlmThread-2_1.so.11*
-%{_libdir}/libImath-2_1.so.11*
+%{_libdir}/libHalf.so.12*
+%{_libdir}/libIex-2_2.so.12*
+%{_libdir}/libIexMath-2_2.so.12*
+%{_libdir}/libIlmThread-2_2.so.12*
+%{_libdir}/libImath-2_2.so.12*
 
 %files devel
 %{_includedir}/OpenEXR/
@@ -94,6 +93,9 @@ make check
 
 
 %changelog
+* Thu Nov 20 2014 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
+- 2.2.0
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index c4dd921..a63a0df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ba2f608191ad020e50277d8a3ba0850  ilmbase-2.1.0.tar.gz
+b540db502c5fa42078249f43d18a4652  ilmbase-2.2.0.tar.gz