[OpenEXR] Update to 1.7.1

Nicolas Chauvet kwizart at fedoraproject.org
Thu Aug 2 22:24:35 UTC 2012


commit 24b8d295dabfd75d592a0f9159927ff8d783e335
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Fri Aug 3 00:24:15 2012 +0200

    Update to 1.7.1

 .gitignore                    |    1 +
 OpenEXR-1.6.1-pkgconfig.patch |   13 ------------
 OpenEXR.spec                  |   42 ++++++++++++++--------------------------
 openexr-1.7.0-cstring.patch   |   11 ----------
 openexr-1.7.1-so6.patch       |   12 +++++++++++
 sources                       |    3 +-
 6 files changed, 29 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e23733..3c872ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 openexr-1.7.0.tar.gz
 openexr-1.7.0.tar.gz.sig
+/openexr-1.7.1.tar.gz
diff --git a/OpenEXR.spec b/OpenEXR.spec
index 98baa64..bea2022 100644
--- a/OpenEXR.spec
+++ b/OpenEXR.spec
@@ -1,27 +1,20 @@
 
 
 Name:	 OpenEXR
-Version: 1.7.0
-Release: 5%{?dist}
+Version: 1.7.1
+Release: 1%{?dist}
 Summary: A high dynamic-range (HDR) image file format
 
 Group:	 System Environment/Libraries
 License: BSD
 URL:	 http://www.openexr.com/
-Source0: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz
-Source1: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz.sig
+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)
 
 Obsoletes: openexr < %{version}-%{release}
 Provides:  openexr = %{version}-%{release}
 
-## upstreamable patches
-Patch50: OpenEXR-1.6.1-pkgconfig.patch
-# missing #include <cstring>
-Patch51: openexr-1.7.0-cstring.patch
-
-## upstream patches
-
 BuildRequires:  automake libtool
 BuildRequires:  ilmbase-devel 
 BuildRequires:  zlib-devel
@@ -54,11 +47,9 @@ Group:   System Environment/Libraries
 
 %prep
 %setup -q -n openexr-%{version}
+%patch0 -p1 -b .so6
 
-%patch50 -p1 -b .pkgconfig
-%patch51 -p1 -b .cstring
-
-%if 0
+%if 1
 # work to remove rpaths, recheck on new releases
 aclocal -Im4
 libtoolize --force
@@ -79,22 +70,16 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# unpackaged files
+#unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
-
-# prepare docs
-mkdir -p rpmdocs
-cp -a IlmImfExamples rpmdocs/examples
-rm -rf rpmdocs/examples/.deps
-
 
 %check
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion OpenEXR)" = "%{version}"
-#make check
+#make check 
 
 
 %clean
@@ -126,8 +111,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Thu Aug 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.7.1-1
+- Update to 1.7.1
+
+-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-5
+-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-4
 - Rebuilt for c++ ABI breakage
diff --git a/openexr-1.7.1-so6.patch b/openexr-1.7.1-so6.patch
new file mode 100644
index 0000000..ccc2def
--- /dev/null
+++ b/openexr-1.7.1-so6.patch
@@ -0,0 +1,12 @@
+diff -up openexr-1.7.1/configure.ac.so6 openexr-1.7.1/configure.ac
+--- openexr-1.7.1/configure.ac.so6	2012-07-18 01:27:28.000000000 +0200
++++ openexr-1.7.1/configure.ac	2012-08-03 00:01:49.547438790 +0200
+@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE(1.6.3)  dnl Require aut
+ AM_MAINTAINER_MODE
+ 
+ 
+-LIBTOOL_CURRENT=7
++LIBTOOL_CURRENT=6
+ LIBTOOL_REVISION=0
+ LIBTOOL_AGE=0
+ LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
diff --git a/sources b/sources
index 4c8b019..e36254b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-27113284f7d26a58f853c346e0851d7a  openexr-1.7.0.tar.gz
-1ffd9feb14c373ebae68228b0495ada0  openexr-1.7.0.tar.gz.sig
+a9e0369dfd68941c50cdaa93e9d7a8d1  openexr-1.7.1.tar.gz


More information about the scm-commits mailing list