rpms/OpenEXR/FC-4 OpenEXR-1.2.2-forwardfriend.patch, NONE, 1.1 OpenEXR-1.2.2-zlib.patch, NONE, 1.1 OpenEXR.spec, 1.4, 1.5

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/OpenEXR/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26925/FC-4

Modified Files:
	OpenEXR.spec 
Added Files:
	OpenEXR-1.2.2-forwardfriend.patch OpenEXR-1.2.2-zlib.patch 
Log Message:
#165729, #165916

OpenEXR-1.2.2-forwardfriend.patch:

--- NEW FILE OpenEXR-1.2.2-forwardfriend.patch ---
--- OpenEXR-1.2.2/exrmaketiled/Image.h.gcc401	2005-08-14 15:36:02.000000000 -0400
+++ OpenEXR-1.2.2/exrmaketiled/Image.h	2005-08-14 15:36:14.000000000 -0400
@@ -49,6 +49,7 @@
 #include <string>
 #include <map>
 
+class Image;
 
 class ImageChannel
 {

OpenEXR-1.2.2-zlib.patch:

--- NEW FILE OpenEXR-1.2.2-zlib.patch ---
--- OpenEXR-1.2.2/OpenEXR.pc.in.zlib	2005-08-13 10:33:18.000000000 -0400
+++ OpenEXR-1.2.2/OpenEXR.pc.in	2005-08-13 10:33:30.000000000 -0400
@@ -7,5 +7,5 @@
 Name: OpenEXR
 Description: OpenEXR image library
 Version: @OPENEXR_VERSION@
-Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
+Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
 Cflags: -I${OpenEXR_includedir}


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenEXR.spec	18 May 2005 14:47:15 -0000	1.4
+++ OpenEXR.spec	16 Aug 2005 16:16:55 -0000	1.5
@@ -1,12 +1,14 @@
 Name:           OpenEXR
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        4%{?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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fltk-devel >= 1.1 zlib-devel
@@ -19,7 +21,7 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version} zlib-devel
+Requires:       %{name} = %{version}
 
 %description    devel
 This package contains headers and libraries required to build applications that
@@ -27,9 +29,11 @@
 
 %prep
 %setup -q
+%patch -p1 -b .zlib
+%patch1 -p1 -b .forwardfriend
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -59,14 +63,21 @@
 %{_datadir}/aclocal/*
 %{_includedir}/OpenEXR
 %{_libdir}/*.a
+%{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Wed May 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-3.fc4
+* Tue Aug 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-4
+- Removed -devel dep on zlib-devel (#165729)
+- Added --disable-static to %%configure
+- Fixed build with GCC 4.0.1
+- Added .so links to -devel
+
+* Wed May 18 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-3
 - Add zlib-devel to BR
 - Delete all .la files (#157652)
 
-* Mon May  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-2.fc4
+* Mon May  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-2
 - Add disttag
 
 * Sun May  8 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-2