rpms/OpenEXR/devel openexr-1.4.0-no_undefined.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 OpenEXR.spec, 1.8, 1.9 sources, 1.2, 1.3 OpenEXR-1.2.2-forwardfriend.patch, 1.1, NONE OpenEXR-1.2.2-zlib.patch, 1.2, NONE needs.rebuild, 1.1, NONE

Mon Sep 11 00:22:37 UTC 2006

Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30667

Modified Files:
	.cvsignore OpenEXR.spec sources 
Added Files:
	openexr-1.4.0-no_undefined.patch 
Removed Files:
	OpenEXR-1.2.2-forwardfriend.patch OpenEXR-1.2.2-zlib.patch 
	needs.rebuild 
Log Message:
* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0a-1
- openexr-1.4.0a


openexr-1.4.0-no_undefined.patch:

--- NEW FILE openexr-1.4.0-no_undefined.patch ---
--- openexr-1.4.0/acinclude.m4.pthread	2005-08-23 12:13:04.000000000 -0500
+++ openexr-1.4.0/acinclude.m4	2006-08-29 15:39:41.000000000 -0500
@@ -244,7 +244,7 @@
 # which indicates that we try without any flags at all, and "pthread-config"
 # which is a program returning the flags for the Pth emulation library.
 
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+acx_pthread_flags="pthreads none -Kthread -kthread lthread pthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
 
 # The ordering *is* (sometimes) important.  Some notes on the
 # individual items follow:
--- openexr-1.4.0/OpenEXR.pc.in.pthread	2006-08-09 00:37:49.000000000 -0500
+++ openexr-1.4.0/OpenEXR.pc.in	2006-08-29 15:41:05.000000000 -0500
@@ -7,5 +7,5 @@
 Name: OpenEXR
 Description: OpenEXR image library
 Version: @OPENEXR_VERSION@
-Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz @PTHREAD_LIBS@
-Cflags: @PTHREAD_CFLAGS@ -I${OpenEXR_includedir}
+Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
+Cflags: -I${OpenEXR_includedir}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 May 2005 03:08:39 -0000	1.2
+++ .cvsignore	11 Sep 2006 00:22:37 -0000	1.3
@@ -1 +1,2 @@
 OpenEXR-1.2.2.tar.gz
+openexr-1.4.0a.tar.gz


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/devel/OpenEXR.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OpenEXR.spec	19 Feb 2006 04:23:12 -0000	1.8
+++ OpenEXR.spec	11 Sep 2006 00:22:37 -0000	1.9
@@ -1,17 +1,24 @@
+
+%define ver 1.4.0
+%define beta a
+
 Name:           OpenEXR
-Version:        1.2.2
-Release:        7%{?dist}
+Version:       	%{ver}%{?beta} 
+Release:        0.1%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.openexr.com/
-Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz
-Patch:          %{name}-1.2.2-zlib.patch
-Patch1:         %{name}-1.2.2-forwardfriend.patch
+Source0:	http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fltk-devel >= 1.1 zlib-devel automake libtool autoconf
+# FIXME: IlmThread contains undefined references to stuff in -lpthread
+Patch1: openexr-1.4.0-no_undefined.patch
+
+BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  zlib-devel
+BuildRequires:  automake libtool
 
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -21,52 +28,71 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
+Requires:       %{name} = %{version}-%{release}
 %description    devel
 This package contains headers and libraries required to build applications that
 use the OpenEXR format.
 
+
 %prep
-%setup -q
-%patch -p1 -b .zlib
-%patch1 -p1 -b .forwardfriend
+%setup -q -n openexr-%{ver}
+
+%patch1 -p1 -b .no_undefined
 ./bootstrap
 
+
 %build
 %configure --disable-static
+
 make %{?_smp_mflags}
 
+
+%check
+# Not enabled, by default, takes a *very* long time. -- Rex
+%{?_with_check:make check}
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name \*.la -exec rm \{\} \;
-install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-cp -a IlmImfExamples $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples/.deps
+
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples
+%doc rpmdocs/examples 
 %{_datadir}/aclocal/*
-%{_includedir}/OpenEXR
-%{_libdir}/*.so
+%{_includedir}/OpenEXR/
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0a-1
+- openexr-1.4.0a
+
 * Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-7
 - Further zlib fixes (#165729)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 May 2005 03:08:39 -0000	1.2
+++ sources	11 Sep 2006 00:22:37 -0000	1.3
@@ -1 +1 @@
-a2e56af78dc47c7294ff188c8f78394b  OpenEXR-1.2.2.tar.gz
+d0a4b9a930c766fa51561b05fb204afe  openexr-1.4.0a.tar.gz


--- OpenEXR-1.2.2-forwardfriend.patch DELETED ---


--- OpenEXR-1.2.2-zlib.patch DELETED ---


--- needs.rebuild DELETED ---


