diff --git a/openexr-1.7.0.tar.bz2 b/openexr-1.7.0.tar.bz2 deleted file mode 100644 index d5b41b9..0000000 --- a/openexr-1.7.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f23fd7de17c8396462390880dd1216087a7201aa84fcb68a3d7ef7cebc445f2 -size 12863774 diff --git a/openexr-1.7.1.tar.gz b/openexr-1.7.1.tar.gz new file mode 100644 index 0000000..2326031 --- /dev/null +++ b/openexr-1.7.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:692ee6566d49939b2613e63b3afea2d38b871c0202cc829a7e32ced780af55c5 +size 13554138 diff --git a/openexr-includes.patch b/openexr-includes.patch deleted file mode 100644 index db8325b..0000000 --- a/openexr-includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: exrenvmap/main.cpp -=================================================================== ---- exrenvmap/main.cpp.orig 2008-10-29 01:00:18.000000000 +0100 -+++ exrenvmap/main.cpp 2010-07-27 14:03:00.470875861 +0200 -@@ -50,6 +50,7 @@ - #include - #include - #include -+#include - - using namespace Imf; - using namespace std; -Index: exrmaketiled/main.cpp -=================================================================== ---- exrmaketiled/main.cpp.orig 2008-03-01 03:30:14.000000000 +0100 -+++ exrmaketiled/main.cpp 2010-07-27 14:03:00.488875189 +0200 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - using namespace Imf; - using namespace std; -Index: exrenvmap/blurImage.cpp -=================================================================== ---- exrenvmap/blurImage.cpp.orig 2009-02-26 00:39:27.000000000 +0100 -+++ exrenvmap/blurImage.cpp 2010-07-27 14:20:31.460876473 +0200 -@@ -43,6 +43,7 @@ - - #include - #include "Iex.h" -+#include - #include - #include - diff --git a/openexr.changes b/openexr.changes index aaaf88c..552edea 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 2 12:46:25 UTC 2012 - mvyskocil@suse.cz + +- Update to 1.7.1 + * Updated the .so verison to 7. + * obsoletes openexr-includes.patch +- require new ilmbase-devel for build +- rename libopenexr-devel to openexr devel to be compatible + with renamed ilmbase package + ------------------------------------------------------------------- Tue Apr 24 13:26:54 UTC 2012 - mvyskocil@suse.cz diff --git a/openexr.spec b/openexr.spec index e7fd393..ee07e7d 100644 --- a/openexr.spec +++ b/openexr.spec @@ -17,17 +17,17 @@ Name: openexr +Version: 1.7.1 +Release: 0 Summary: Utilities for work with HDR images in OpenEXR format License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Graphics/Other -Version: 1.7.0 -Release: 0 Url: http://www.openexr.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ -BuildRequires: libilmbase-devel +BuildRequires: ilmbase-devel # bug437293 %ifarch ppc64 Obsoletes: OpenEXR-64bit @@ -35,12 +35,11 @@ Obsoletes: OpenEXR-64bit # Obsoletes: OpenEXR <= 1.6.1 Provides: OpenEXR = %{version} -Source0: %{name}-%version.tar.bz2 +Source0: %{name}-%version.tar.gz Source1: baselibs.conf Patch0: openexr-suse-docdir.patch -Patch1: openexr-includes.patch # disable broken tests -Patch2: openexr-disable-tests.patch +Patch1: openexr-disable-tests.patch %description OpenEXR is a high dynamic-range (HDR) image file format developed by @@ -55,29 +54,40 @@ contains a set of utilities to work with this format. * exr2aces, converter to ACES format * exrmultiview, combine two or more images into one multi-view -%package -n libIlmImf6 +%package -n libIlmImf7 Summary: Library to Handle EXR Pictures in 16-Bit Floating-Point Format Group: Development/Libraries/C and C++ # provide also the most expected symbol -Provides: libopenexr6 = %{version} +Provides: libopenexr7 = %{version} -%description -n libIlmImf6 +%description -n libIlmImf7 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. This package contains libIlmImf.so.6 -%package -n libopenexr-devel +%post -n libIlmImf7 -p /sbin/ldconfig + +%postun -n libIlmImf7 -p /sbin/ldconfig + +%files -n libIlmImf7 +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libIlmImf.so.* + +%package devel Summary: Library to Handle EXR Pictures (16-bit floating-point format) Group: Development/Libraries/C and C++ Obsoletes: OpenEXR-devel <= 1.6.1 Provides: OpenEXR-devel = %{version} +Obsoletes: libopenexr-devel <= 1.7.0 +Provides: libopenexr-devel = %{version} Requires: libilmbase-devel -Requires: libopenexr6 = %{version} +Requires: libopenexr7 = %{version} Requires: pkg-config Requires: zlib-devel -%description -n libopenexr-devel +%description devel OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. @@ -97,10 +107,10 @@ This package contains a documentation %prep %setup -q -%patch0 -b .sav -%patch1 -b .sav -%patch2 -p1 -b .sav -# rename a non-linux file +%patch0 -p0 +%patch1 -p1 + +# remove a non-linux file %{__rm} README.win32 README.OSX %build @@ -124,10 +134,6 @@ export PTHREAD_LIBS="-lpthread" # so let disable it # % {__make} check -%post -n libIlmImf6 -p /sbin/ldconfig - -%postun -n libIlmImf6 -p /sbin/ldconfig - %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING LICENSE NEWS README* @@ -139,12 +145,7 @@ export PTHREAD_LIBS="-lpthread" %{_bindir}/exr2aces %{_bindir}/exrmultiview -%files -n libIlmImf6 -%defattr(-,root,root) -%doc COPYING -%{_libdir}/libIlmImf.so.* - -%files -n libopenexr-devel +%files devel %defattr(-,root,root) %{_includedir}/OpenEXR %{_libdir}/libIlmImf.so