[OpenEXR] upstream ABI conditional (f19+, el7+)

Rex Dieter rdieter at fedoraproject.org
Sun Mar 10 19:42:27 UTC 2013


commit b43c1b40ba8cc30b1ec352a32d578d259e7715b5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 10 14:41:46 2013 -0500

    upstream ABI conditional (f19+, el7+)

 OpenEXR.spec |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/OpenEXR.spec b/OpenEXR.spec
index eb3a57c..7c04922 100644
--- a/OpenEXR.spec
+++ b/OpenEXR.spec
@@ -1,5 +1,4 @@
 
-
 Name:	 OpenEXR
 Version: 1.7.1
 Release: 5%{?dist}
@@ -11,6 +10,19 @@ URL:	 http://www.openexr.com/
 Source0: https://github.com/downloads/openexr/openexr/openexr-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%global soname 7
+
+## fedora patches
+%if 0%{?fedora} < 19 && 0%{?rhel} < 7
+# 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.
+%global soname 6
+Patch0: openexr-1.7.1-so6.patch
+BuildRequires: automake libtool
+%endif
+
 Obsoletes: openexr < %{version}-%{release}
 Provides:  openexr = %{version}-%{release}
 
@@ -46,6 +58,10 @@ Group:   System Environment/Libraries
 %prep
 %setup -q -n openexr-%{version}
 
+%if "%{?soname}" == "6"
+%patch0 -p1 -b .so6
+./bootstrap
+%endif
 
 %build
 %configure --disable-static
@@ -69,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %check
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion OpenEXR)" = "%{version}"
-make check 
+make check
 
 
 %clean
@@ -86,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
-%{_libdir}/libIlmImf.so.7*
+%{_libdir}/libIlmImf.so.%{soname}*
 
 %files devel
 %defattr(-,root,root,-)
@@ -100,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Sun Mar 10 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.7.1-5
-- Back to upstream ABI
+- Back to upstream ABI (f19+, el7+)
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild


More information about the scm-commits mailing list