[ilmbase/f14/master] - ilmbase-1.0.2

[Rex Dieter]

commit 09c337819177e61682f9aaf55e137d5911dd41b9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 10 23:01:54 2010 -0500

    - ilmbase-1.0.2

 .gitignore                       |    2 ++
 ilmbase-1.0.0-no_undefined.patch |   11 -----------
 ilmbase-1.0.0-pkgconfig.patch    |   10 ----------
 ilmbase-1.0.2-cstring.patch      |   11 +++++++++++
 ilmbase.spec                     |   34 ++++++++++++++++++----------------
 sources                          |    4 ++--
 6 files changed, 33 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7daa68f..448204f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 ilmbase-1.0.1.tar.gz
 ilmbase-1.0.1.tar.gz.sig
+ilmbase-1.0.2.tar.gz
+ilmbase-1.0.2.tar.gz.sig
diff --git a/ilmbase-1.0.2-cstring.patch b/ilmbase-1.0.2-cstring.patch
new file mode 100644
index 0000000..63cfa24
--- /dev/null
+++ b/ilmbase-1.0.2-cstring.patch
@@ -0,0 +1,11 @@
+diff -up ilmbase-1.0.2/Imath/ImathMatrix.h.cstring ilmbase-1.0.2/Imath/ImathMatrix.h
+--- ilmbase-1.0.2/Imath/ImathMatrix.h.cstring	2010-07-16 17:48:40.000000000 -0500
++++ ilmbase-1.0.2/Imath/ImathMatrix.h	2010-07-28 09:49:44.528455468 -0500
+@@ -49,6 +49,7 @@
+ #include "ImathVec.h"
+ #include "ImathShear.h"
+ 
++#include <cstring>
+ #include <iostream>
+ #include <iomanip>
+ 
diff --git a/ilmbase.spec b/ilmbase.spec
index 3d92564..e8308a4 100644
--- a/ilmbase.spec
+++ b/ilmbase.spec
@@ -1,7 +1,7 @@
 
 Name:	 ilmbase 
-Version: 1.0.1
-Release: 6%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 Summary: Abstraction/convenience libraries
 
 Group:	 System Environment/Libraries
@@ -11,14 +11,12 @@ Source0: http://download.savannah.nongnu.org/releases/openexr/ilmbase-%{version}
 Source1: http://download.savannah.nongnu.org/releases/openexr/ilmbase-%{version}.tar.gz.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: automake libtool
+#BuildRequires: automake libtool
 BuildRequires: pkgconfig
 
-# undefined pthread symbols
-Patch1: ilmbase-1.0.0-no_undefined.patch
-# move pthread linkage to Libs.private, tho probably not needed
-# if already using patch1 above.
-Patch2: ilmbase-1.0.0-pkgconfig.patch
+## upstreamable patches
+# missing #include <cstring>
+Patch50: ilmbase-1.0.2-cstring.patch
 
 %description
 Half is a class that encapsulates the ilm 16-bit floating-point format.
@@ -44,11 +42,7 @@ Requires: pkgconfig
 %prep
 %setup -q
 
-%patch1 -p1 -b .no_undefined
-%patch2 -p1 -b .pkgconfig
-
-# for patch1
-./bootstrap
+%patch50 -p1 -b .cstring
 
 
 %build
@@ -60,12 +54,14 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %check
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion IlmBase)" = "%{version}"
 make check
 
 
@@ -81,16 +77,22 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/lib*.so.*
+%{_libdir}/libHalf.so.6*
+%{_libdir}/libIex.so.6*
+%{_libdir}/libIlmThread.so.6*
+%{_libdir}/libImath.so.6*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/OpenEXR/
 %{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/IlmBase.pc
 
 
 %changelog
+* Wed Jul 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
+- ilmbase-1.0.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 404e47f..47d4f35 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f76f094e69a6079b0beb93d97e2a217e  ilmbase-1.0.1.tar.gz
-5424798ccce535b89d4290a0dfc1fe42  ilmbase-1.0.1.tar.gz.sig
+26c133ee8ca48e1196fbfb3ffe292ab4  ilmbase-1.0.2.tar.gz
+f1c23889db53c6b89bf1c7fdf26da3d6  ilmbase-1.0.2.tar.gz.sig