[ilmbase] 2.0.1

Sun Sep 8 21:48:49 UTC 2013

commit c28d72c9530a62d4ba40cc5a7c1676dc7b452aa1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Sep 8 16:48:40 2013 -0500

    2.0.1

 .gitignore                       |    3 +-
 ilmbase-1.0.2-no_undefined.patch |   31 ------------------------
 ilmbase-1.0.3-secondary.patch    |   12 ---------
 ilmbase-1.0.3-so6.patch          |   12 ---------
 ilmbase-1.0.3-ucontext.patch     |   28 ----------------------
 ilmbase-2.0.1-no_undefined.patch |   24 +++++++++++++++++++
 ilmbase.spec                     |   48 +++++++++++++------------------------
 sources                          |    2 +-
 8 files changed, 43 insertions(+), 117 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3b0738b..b1bf55b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/ilmbase-1.0.2.tar.gz
-/ilmbase-1.0.2.tar.gz.sig
 /ilmbase-1.0.3.tar.gz
+/ilmbase-2.0.1.tar.gz
diff --git a/ilmbase-2.0.1-no_undefined.patch b/ilmbase-2.0.1-no_undefined.patch
new file mode 100644
index 0000000..87a35c9
--- /dev/null
+++ b/ilmbase-2.0.1-no_undefined.patch
@@ -0,0 +1,24 @@
+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
+@@ -14,7 +14,7 @@ libIlmThread_la_LDFLAGS = -version-info
+ if LIB_SUFFIX_EXISTS
+ libIlmThread_la_LDFLAGS += -release @LIB_SUFFIX@
+ endif
+-libIlmThread_la_LIBADD = ../Iex/libIex.la
++libIlmThread_la_LIBADD = ../Iex/libIex.la $(PTHREAD_LIBS)
+ 
+ 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.
+ 
+ libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
+ 	-no-undefined $(am__append_1)
+-libIlmThread_la_LIBADD = ../Iex/libIex.la
++libIlmThread_la_LIBADD = ../Iex/libIex.la $(PTHREAD_LIBS)
+ libIlmThreadincludedir = $(includedir)/OpenEXR
+ libIlmThreadinclude_HEADERS = IlmThreadPool.h IlmThread.h \
+ 			      IlmThreadSemaphore.h IlmThreadMutex.h \
diff --git a/ilmbase.spec b/ilmbase.spec
index b650cbf..4ef642d 100644
--- a/ilmbase.spec
+++ b/ilmbase.spec
@@ -1,36 +1,25 @@
-Name:	 ilmbase 
-Version: 1.0.3
-Release: 7%{?dist}
+Name:    ilmbase
+Version: 2.0.1
+Release: 1%{?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
 
-BuildRequires: automake libtool
+#BuildRequires: automake libtool
 BuildRequires: pkgconfig
 # silly rpm, won't pick up rpm dependencies for items not in it's buildroot
 # see http://bugzilla.redhat.com/866302
 BuildRequires: pkgconfig(gl) pkgconfig(glu)
 
 ## upstreamable patches
-# revert soname bump
-# upstream missed bumping to so7 for OpenEXR-1.7.0, decided to do so now for
-# OpenEXR-1.7.1.  given fedora has shipped OpenEXR-1.7.0 since f15, bumping
-# ABI now makes little sense.
-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
-# the FPU exception code is x86 specific
-Patch52: ilmbase-1.0.3-secondary.patch
+Patch51: ilmbase-2.0.1-no_undefined.patch
 # add Requires.private: gl glu to IlmBase.pc
 Patch53:  ilmbase-1.0.3-pkgconfig.patch
 
 ## upstream patches
-# fix build on i686/32bit
-# https://github.com/openexr/openexr/issues/3
-Patch100: ilmbase-1.0.3-ucontext.patch
 
 %description
 Half is a class that encapsulates the ilm 16-bit floating-point format.
@@ -45,7 +34,6 @@ Iex is an exception-handling library.
 
 %package devel
 Summary: Headers and libraries for building apps that use %{name} 
-Group:	 Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
@@ -54,15 +42,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %prep
 %setup -q
 
-%patch50 -p1 -b .so6
 %patch51 -p1 -b .no_undefined
-%patch52 -p1 -b .secondary
 %patch53 -p1 -b .pkgconfig
-%ifarch %{ix86} %{arm} ppc
-%patch100 -p1 -b .ucontext
-%endif
 
-./bootstrap
+#/bootstrap
 
 
 %build
@@ -74,9 +57,9 @@ make %{?_smp_mflags} PTHREAD_LIBS="-pthread -lpthread"
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=%{buildroot}
 
-rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -fv %{buildroot}%{_libdir}/lib*.la
 
 
 %check
@@ -95,11 +78,11 @@ make check
 
 %files
 %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*
+%{_libdir}/libHalf.so.10*
+%{_libdir}/libIex-2_0.so.10*
+%{_libdir}/libIexMath-2_0.so.10*
+%{_libdir}/libIlmThread-2_0.so.10*
+%{_libdir}/libImath-2_0.so.10*
 
 %files devel
 %{_includedir}/OpenEXR/
@@ -108,6 +91,9 @@ make check
 
 
 %changelog
+* Thu Aug 29 2013 Rex Dieter <rdieter at fedoraproject.org>  2.0.1-1
+- 2.0.1
+
 * Thu Aug 29 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.0.3-7
 - Fix spec issues, modernise spec
 
diff --git a/sources b/sources
index f911b6e..8fd02d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d99962ec7e2bfac0647aaabf6b91d5de  ilmbase-1.0.3.tar.gz
+74c0d0d2873960bd0dc1993f8e03f0ae  ilmbase-2.0.1.tar.gz
