[OpenEXR] cosmetics, patch comments

Rex Dieter rdieter at fedoraproject.org
Mon Aug 27 23:53:33 UTC 2012


commit 8a3e55b33fea940400f24fe6b1f7d935caca6ae2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 18:56:54 2012 -0500

    cosmetics, patch comments

 OpenEXR.spec |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/OpenEXR.spec b/OpenEXR.spec
index 86de6c7..799ce6f 100644
--- a/OpenEXR.spec
+++ b/OpenEXR.spec
@@ -9,9 +9,15 @@ Group:	 System Environment/Libraries
 License: BSD
 URL:	 http://www.openexr.com/
 Source0: https://github.com/downloads/openexr/openexr/openexr-%{version}.tar.gz
-Patch0: openexr-1.7.1-so6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## fedora patches
+# 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.
+Patch0: openexr-1.7.1-so6.patch
+
 Obsoletes: openexr < %{version}-%{release}
 Provides:  openexr = %{version}-%{release}
 
@@ -47,17 +53,9 @@ Group:   System Environment/Libraries
 
 %prep
 %setup -q -n openexr-%{version}
-%patch0 -p1 -b .so6
 
-%if 1
+%patch0 -p1 -b .so6
 ./bootstrap
-%else
-# work to remove rpaths, recheck on new releases
-aclocal -Im4
-libtoolize --force
-rm -f configure
-autoconf
-%endif
 
 
 %build
@@ -73,15 +71,16 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 #unpackaged files
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 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


More information about the scm-commits mailing list