[OpenEXR] 2.2.0

[Rex Dieter]

commit f3f8237fde37c897de9cc78d740d4e1ca0bfe8fc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Nov 25 12:32:08 2014 -0600

    2.2.0

 .gitignore                  |    1 +
 OpenEXR.spec                |   22 +++++++++++++---------
 openexr-2.1.0-headers.patch |   26 --------------------------
 sources                     |    2 +-
 4 files changed, 15 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70a81cc..b26a49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /openexr-1.7.1.tar.gz
 /openexr-2.1.0.tar.gz
+/openexr-2.2.0.tar.gz
diff --git a/OpenEXR.spec b/OpenEXR.spec
index d797ea8..cacace9 100644
--- a/OpenEXR.spec
+++ b/OpenEXR.spec
@@ -1,8 +1,8 @@
 
 Name:	 OpenEXR
 Summary: A high dynamic-range (HDR) image file format
-Version: 2.1.0
-Release: 5%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 
 License: BSD
 URL:	 http://www.openexr.com/
@@ -10,12 +10,13 @@ Source0: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}
 # fix tests for big endian arches
 # https://github.com/openexr/openexr/issues/81
 Patch0:  openexr-2.1.0-bigendian.patch
-# install missing headers
-Patch1:  openexr-2.1.0-headers.patch
 
 Obsoletes: openexr < %{version}-%{release}
 Provides:  openexr = %{version}-%{release}
 
+# https://github.com/openexr/openexr/issues/130
+BuildConflicts: OpenEXR-devel < 2.2.0
+
 BuildRequires: ilmbase-devel >= %{version}
 BuildRequires: zlib-devel
 BuildRequires: pkgconfig
@@ -45,7 +46,6 @@ Summary: %{name} runtime libraries
 %prep
 %setup -q -n openexr-%{version}
 %patch0 -p1 -b .bigendian
-%patch1 -p1 -b .headers
 
 
 %build
@@ -66,9 +66,9 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}
 
 
 %check
-export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion OpenEXR)" = "%{version}"
-make check ||:
+make %{?_smp_mflags} check ||:
 
 
 %files
@@ -79,18 +79,22 @@ make check ||:
 
 %files libs
 %doc AUTHORS ChangeLog LICENSE NEWS README
-%{_libdir}/libIlmImf-Imf_2_1.so.21*
+%{_libdir}/libIlmImf-2_2.so.22*
+%{_libdir}/libIlmImfUtil-2_2.so.22*
 
 %files devel
 #omit for now, they're mostly useless, and include multilib conflicts (#342781)
 #doc rpmdocs/examples 
 %{_datadir}/aclocal/openexr.m4
 %{_includedir}/OpenEXR/*
-%{_libdir}/libIlmImf.so
+%{_libdir}/libIlmImf*.so
 %{_libdir}/pkgconfig/OpenEXR.pc
 
 
 %changelog
+* Thu Nov 20 2014 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
+- 2.2.0
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 1bd0eee..16a3cbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-250553b2662529cb8cb7e932fa91a3d5  openexr-2.1.0.tar.gz
+b64e931c82aa3790329c21418373db4e  openexr-2.2.0.tar.gz