From f9c869677907598be5b7195d25e2d8d9869c1208 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 27 Mar 2013 21:13:51 +0100 Subject: [PATCH] - updated to 2.0.0 (note: new sonames) - updated link patch - removed obsolete gcc4 patch - added am patch (fixes build with automake 1.13) --- ilmbase-am.patch | 11 +++++++++++ ilmbase-gcc4.patch | 10 ---------- ilmbase-link.patch | 12 ++++++------ ilmbase.spec | 27 ++++++++++++++++----------- 4 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 ilmbase-am.patch delete mode 100644 ilmbase-gcc4.patch diff --git a/ilmbase-am.patch b/ilmbase-am.patch new file mode 100644 index 0000000..66bc36b --- /dev/null +++ b/ilmbase-am.patch @@ -0,0 +1,11 @@ +--- ilmbase-2.0.0/configure.ac.orig 2013-03-24 22:10:51.564376808 +0100 ++++ ilmbase-2.0.0/configure.ac 2013-03-25 18:46:00.864599978 +0100 +@@ -10,7 +10,7 @@ + + AC_CANONICAL_HOST + AC_CONFIG_SRCDIR(ImathTest/main.cpp) +-AM_CONFIG_HEADER(config/IlmBaseConfig.h) ++AC_CONFIG_HEADERS(config/IlmBaseConfig.h) + AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better + AM_MAINTAINER_MODE + diff --git a/ilmbase-gcc4.patch b/ilmbase-gcc4.patch deleted file mode 100644 index 7a8c74d..0000000 --- a/ilmbase-gcc4.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ilmbase-1.0.2/Imath/ImathMatrix.h.orig 2010-07-17 00:48:40.000000000 +0200 -+++ ilmbase-1.0.2/Imath/ImathMatrix.h 2010-10-12 21:52:33.083743558 +0200 -@@ -49,6 +49,7 @@ - #include "ImathVec.h" - #include "ImathShear.h" - -+#include - #include - #include - diff --git a/ilmbase-link.patch b/ilmbase-link.patch index 849db93..eaa16bb 100644 --- a/ilmbase-link.patch +++ b/ilmbase-link.patch @@ -1,9 +1,9 @@ ---- ilmbase-1.0.1/IlmThread/Makefile.am.orig 2006-12-08 22:59:36.000000000 +0100 -+++ ilmbase-1.0.1/IlmThread/Makefile.am 2008-01-13 13:02:47.060607251 +0100 -@@ -11,7 +11,7 @@ - IlmThreadMutexPosix.cpp - - libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined +--- ilmbase-2.0.0/IlmThread/Makefile.am.orig 2013-03-24 22:09:40.304379798 +0100 ++++ ilmbase-2.0.0/IlmThread/Makefile.am 2013-03-24 22:10:06.604378695 +0100 +@@ -14,7 +14,7 @@ + if LIB_SUFFIX_EXISTS + libIlmThread_la_LDFLAGS += -release @LIB_SUFFIX@ + endif -libIlmThread_la_LIBADD = ../Iex/libIex.la +libIlmThread_la_LIBADD = ../Iex/libIex.la -lpthread diff --git a/ilmbase.spec b/ilmbase.spec index 29d42db..2b72f33 100644 --- a/ilmbase.spec +++ b/ilmbase.spec @@ -1,20 +1,20 @@ Summary: IlmBase - base math and exception libraries from OpenEXR project Summary(pl.UTF-8): IlmBase - podstawowe biblioteki matematyczne i wyjątków z projektu OpenEXR Name: ilmbase -Version: 1.0.2 +Version: 2.0.0 Release: 1 License: BSD Group: Libraries Source0: http://download.savannah.nongnu.org/releases/openexr/%{name}-%{version}.tar.gz -# Source0-md5: 26c133ee8ca48e1196fbfb3ffe292ab4 +# Source0-md5: 70f1413840c2a228783d1332b8b168e6 Patch0: %{name}-link.patch Patch1: %{name}-sh.patch -Patch2: %{name}-gcc4.patch +Patch2: %{name}-am.patch URL: http://www.openexr.com/ BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1.6.3 BuildRequires: libstdc++-devel -BuildRequires: libtool +BuildRequires: libtool >= 2:1.5 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -104,22 +104,26 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc AUTHORS COPYING ChangeLog NEWS README %attr(755,root,root) %{_libdir}/libHalf.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libHalf.so.6 -%attr(755,root,root) %{_libdir}/libIex.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libIex.so.6 -%attr(755,root,root) %{_libdir}/libIlmThread.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libIlmThread.so.6 -%attr(755,root,root) %{_libdir}/libImath.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libImath.so.6 +%attr(755,root,root) %ghost %{_libdir}/libHalf.so.10 +%attr(755,root,root) %{_libdir}/libIex-2_0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libIex-2_0.so.10 +%attr(755,root,root) %{_libdir}/libIexMath-2_0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libIexMath-2_0.so.10 +%attr(755,root,root) %{_libdir}/libIlmThread-2_0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libIlmThread-2_0.so.10 +%attr(755,root,root) %{_libdir}/libImath-2_0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libImath-2_0.so.10 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libHalf.so %attr(755,root,root) %{_libdir}/libIex.so +%attr(755,root,root) %{_libdir}/libIexMath.so %attr(755,root,root) %{_libdir}/libIlmThread.so %attr(755,root,root) %{_libdir}/libImath.so %{_libdir}/libHalf.la %{_libdir}/libIex.la +%{_libdir}/libIexMath.la %{_libdir}/libIlmThread.la %{_libdir}/libImath.la %dir %{_includedir}/OpenEXR @@ -134,5 +138,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{_libdir}/libHalf.a %{_libdir}/libIex.a +%{_libdir}/libIexMath.a %{_libdir}/libIlmThread.a %{_libdir}/libImath.a -- 2.44.0