[mingw-ilmbase] Update to 2.2.0

Sandro Mani smani at fedoraproject.org
Wed Nov 26 08:51:32 UTC 2014


commit bfac59e963eae55395b02c0dfbdd2f04f74caa8d
Author: Sandro Mani <manisandro at gmail.com>
Date:   Wed Nov 26 09:51:26 2014 +0100

    Update to 2.2.0

 .gitignore                                         |    1 +
 ...os.patch => ilmbase-2.2.0_obsolete-macros.patch |    8 ++--
 ...eads.patch => ilmbase-2.2.0_win32-threads.patch |    0
 mingw-ilmbase.spec                                 |   31 +++++++++++---------
 sources                                            |    2 +-
 5 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19c9a0c..9064351 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ilmbase-2.1.0.tar.gz
+/ilmbase-2.2.0.tar.gz
diff --git a/ilmbase-2.1.0_obsolete-macros.patch b/ilmbase-2.2.0_obsolete-macros.patch
similarity index 62%
rename from ilmbase-2.1.0_obsolete-macros.patch
rename to ilmbase-2.2.0_obsolete-macros.patch
index 8140b91..9ababd1 100644
--- a/ilmbase-2.1.0_obsolete-macros.patch
+++ b/ilmbase-2.2.0_obsolete-macros.patch
@@ -1,11 +1,11 @@
-diff -rupN ilmbase-2.1.0/configure.ac ilmbase-2.1.0-new/configure.ac
---- ilmbase-2.1.0/configure.ac	2013-11-12 00:09:51.000000000 +0100
-+++ ilmbase-2.1.0-new/configure.ac	2014-01-13 16:32:49.754639829 +0100
+diff -rupN ilmbase-2.2.0/configure.ac ilmbase-2.2.0-new/configure.ac
+--- ilmbase-2.2.0/configure.ac	2014-08-10 06:23:56.000000000 +0200
++++ ilmbase-2.2.0-new/configure.ac	2014-11-26 09:41:32.874633732 +0100
 @@ -10,7 +10,7 @@ AC_SUBST(ILMBASE_VERSION_API, ${ILMBASE_
  
  AC_CANONICAL_HOST
  AC_CONFIG_SRCDIR(ImathTest/main.cpp)
--AM_CONFIG_HEADER(config/IlmBaseConfig.h)
+-AC_CONFIG_HEADER(config/IlmBaseConfig.h)
 +AC_CONFIG_HEADERS(config/IlmBaseConfig.h)
  AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
  AM_MAINTAINER_MODE
diff --git a/ilmbase-2.1.0-win32_threads.patch b/ilmbase-2.2.0_win32-threads.patch
similarity index 100%
rename from ilmbase-2.1.0-win32_threads.patch
rename to ilmbase-2.2.0_win32-threads.patch
diff --git a/mingw-ilmbase.spec b/mingw-ilmbase.spec
index c729e47..71673f9 100644
--- a/mingw-ilmbase.spec
+++ b/mingw-ilmbase.spec
@@ -3,8 +3,8 @@
 %global pkgname ilmbase
 
 Name:          mingw-%{pkgname}
-Version:       2.1.0
-Release:       2%{?dist}
+Version:       2.2.0
+Release:       1%{?dist}
 Summary:       MinGW Windows %{pkgname} library
 
 License:       BSD
@@ -13,9 +13,9 @@ BuildArch:     noarch
 Source0:       http://download.savannah.nongnu.org/releases/openexr/%{pkgname}-%{version}.tar.gz
 
 # use win32 threads
-Patch0:        ilmbase-2.1.0-win32_threads.patch
+Patch0:        ilmbase-2.2.0_win32-threads.patch
 # replace obsolete configure.ac macros
-Patch1:        ilmbase-2.1.0_obsolete-macros.patch
+Patch1:        ilmbase-2.2.0_obsolete-macros.patch
 
 BuildRequires: autoconf automake libtool
 
@@ -90,11 +90,11 @@ find %{buildroot} -name '*.la' -delete
 
 %files -n mingw32-%{pkgname}
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{mingw32_bindir}/libHalf-11.dll
-%{mingw32_bindir}/libIex-2_1-11.dll
-%{mingw32_bindir}/libIexMath-2_1-11.dll
-%{mingw32_bindir}/libIlmThread-2_1-11.dll
-%{mingw32_bindir}/libImath-2_1-11.dll
+%{mingw32_bindir}/libHalf-12.dll
+%{mingw32_bindir}/libIex-2_2-12.dll
+%{mingw32_bindir}/libIexMath-2_2-12.dll
+%{mingw32_bindir}/libIlmThread-2_2-12.dll
+%{mingw32_bindir}/libImath-2_2-12.dll
 %dir %{mingw32_includedir}/OpenEXR
 %{mingw32_includedir}/OpenEXR/*.h
 %{mingw32_libdir}/libHalf.dll.a
@@ -113,11 +113,11 @@ find %{buildroot} -name '*.la' -delete
 
 %files -n mingw64-%{pkgname}
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{mingw64_bindir}/libHalf-11.dll
-%{mingw64_bindir}/libIex-2_1-11.dll
-%{mingw64_bindir}/libIexMath-2_1-11.dll
-%{mingw64_bindir}/libIlmThread-2_1-11.dll
-%{mingw64_bindir}/libImath-2_1-11.dll
+%{mingw64_bindir}/libHalf-12.dll
+%{mingw64_bindir}/libIex-2_2-12.dll
+%{mingw64_bindir}/libIexMath-2_2-12.dll
+%{mingw64_bindir}/libIlmThread-2_2-12.dll
+%{mingw64_bindir}/libImath-2_2-12.dll
 %dir %{mingw64_includedir}/OpenEXR
 %{mingw64_includedir}/OpenEXR/*.h
 %{mingw64_libdir}/libHalf.dll.a
@@ -136,6 +136,9 @@ find %{buildroot} -name '*.la' -delete
 
 
 %changelog
+* Wed Nov 26 2014 Sandro Mani <manisandro at gmail.com> - 2.2.0-1
+- Update to 2.2.0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index c4dd921..a63a0df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ba2f608191ad020e50277d8a3ba0850  ilmbase-2.1.0.tar.gz
+b540db502c5fa42078249f43d18a4652  ilmbase-2.2.0.tar.gz


More information about the scm-commits mailing list