From 447913e95d30a91c28a2468039a59a208b43ccc7 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 28 Mar 2013 17:55:34 +0100 Subject: [PATCH] - updated to 2.0.0 (note: new soname) - removed obsolete gcc4 patch - added am patch (fixes build with automake 1.13) --- OpenEXR-am.patch | 11 +++++++++++ OpenEXR-gcc4.patch | 10 ---------- OpenEXR.spec | 21 ++++++++++----------- 3 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 OpenEXR-am.patch delete mode 100644 OpenEXR-gcc4.patch diff --git a/OpenEXR-am.patch b/OpenEXR-am.patch new file mode 100644 index 0000000..1565a91 --- /dev/null +++ b/OpenEXR-am.patch @@ -0,0 +1,11 @@ +--- openexr-2.0.0/configure.ac.orig 2013-03-14 17:57:54.000000000 +0100 ++++ openexr-2.0.0/configure.ac 2013-03-27 21:40:10.626909806 +0100 +@@ -11,7 +11,7 @@ + + AC_CANONICAL_HOST + AC_CONFIG_SRCDIR(IlmImfTest/main.cpp) +-AM_CONFIG_HEADER(config/OpenEXRConfig.h) ++AC_CONFIG_HEADERS(config/OpenEXRConfig.h) + AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better + AM_MAINTAINER_MODE + diff --git a/OpenEXR-gcc4.patch b/OpenEXR-gcc4.patch deleted file mode 100644 index 2356753..0000000 --- a/OpenEXR-gcc4.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- openexr-1.7.0/exrenvmap/blurImage.cpp.orig 2009-02-26 00:39:27.000000000 +0100 -+++ openexr-1.7.0/exrenvmap/blurImage.cpp 2010-10-12 21:56:11.687740205 +0200 -@@ -43,6 +43,7 @@ - - #include - #include "Iex.h" -+#include - #include - #include - diff --git a/OpenEXR.spec b/OpenEXR.spec index d603bf0..158c0e6 100644 --- a/OpenEXR.spec +++ b/OpenEXR.spec @@ -1,23 +1,22 @@ Summary: High dynamic-range (HDR) image file format support libraries Summary(pl.UTF-8): Biblioteki obsługujące format plików obrazu o wysokiej dynamice (HDR) Name: OpenEXR -Version: 1.7.0 +Version: 2.0.0 Release: 1 License: BSD Group: Libraries Source0: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz -# Source0-md5: 27113284f7d26a58f853c346e0851d7a -#Patch0: gcc4.patch -Patch0: %{name}-gcc4.patch +# Source0-md5: 00e9e93348f072c0bc1bdee7464d500d +Patch0: %{name}-am.patch URL: http://www.openexr.com/ BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1.6.3 -BuildRequires: ilmbase-devel >= 1.0.2 +BuildRequires: ilmbase-devel >= 2.0.0 BuildRequires: libstdc++-devel -BuildRequires: libtool +BuildRequires: libtool >= 2:1.5 BuildRequires: pkgconfig BuildRequires: zlib-devel -Requires: ilmbase >= 1.0.2 +Requires: ilmbase >= 2.0.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -42,7 +41,7 @@ Summary: Header files for OpenEXR libraries Summary(pl.UTF-8): Pliki nagłówkowe bibliotek OpenEXR Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: ilmbase-devel >= 1.0.2 +Requires: ilmbase-devel >= 2.0.0 Requires: libstdc++-devel Requires: zlib-devel @@ -104,8 +103,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS COPYING ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/libIlmImf.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libIlmImf.so.6 +%attr(755,root,root) %{_libdir}/libIlmImf-Imf_2_0.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libIlmImf-Imf_2_0.so.20 %files devel %defattr(644,root,root,755) @@ -122,10 +121,10 @@ rm -rf $RPM_BUILD_ROOT %files progs %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/exr2aces %attr(755,root,root) %{_bindir}/exrenvmap %attr(755,root,root) %{_bindir}/exrheader %attr(755,root,root) %{_bindir}/exrmakepreview %attr(755,root,root) %{_bindir}/exrmaketiled +%attr(755,root,root) %{_bindir}/exrmultipart %attr(755,root,root) %{_bindir}/exrmultiview %attr(755,root,root) %{_bindir}/exrstdattr -- 2.43.0