rpms/OpenEXR/FC-4 OpenEXR-1.2.2-zlib.patch, 1.1, 1.2 OpenEXR.spec, 1.6, 1.7
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Sun Feb 19 04:23:06 UTC 2006
Author: ivazquez
Update of /cvs/extras/rpms/OpenEXR/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29179/FC-4
Modified Files:
OpenEXR-1.2.2-zlib.patch OpenEXR.spec
Log Message:
Further zlib fixes (#165729)
OpenEXR-1.2.2-zlib.patch:
Index: OpenEXR-1.2.2-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR-1.2.2-zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenEXR-1.2.2-zlib.patch 16 Aug 2005 16:16:55 -0000 1.1
+++ OpenEXR-1.2.2-zlib.patch 19 Feb 2006 04:23:06 -0000 1.2
@@ -7,3 +7,49 @@
-Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
+Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
Cflags: -I${OpenEXR_includedir}
+--- OpenEXR-1.2.2/Half/Makefile.am.165729 2004-02-05 23:22:01.000000000 -0600
++++ OpenEXR-1.2.2/Half/Makefile.am 2006-02-09 22:42:18.000000000 -0600
+@@ -4,7 +4,7 @@
+
+ libHalf_la_SOURCES = half.cpp half.h halfFunction.h halfLimits.h
+
+-libHalf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
++libHalf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined -Wl,--no-undefined
+
+ libHalfincludedir = $(includedir)/OpenEXR
+
+--- OpenEXR-1.2.2/IlmImf/Makefile.am.165729 2004-12-16 20:01:57.000000000 -0600
++++ OpenEXR-1.2.2/IlmImf/Makefile.am 2006-02-09 22:44:15.000000000 -0600
+@@ -54,7 +54,8 @@
+ ImfPxr24Compressor.cpp ImfPxr24Compressor.h \
+ ImfTestFile.cpp ImfTestFile.h
+
+-libIlmImf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
++libIlmImf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined -Wl,--no-undefined
++libIlmImf_la_LIBADD = ../Half/libHalf.la ../Iex/libIex.la -lz
+
+ libIlmImfincludedir = $(includedir)/OpenEXR
+
+--- OpenEXR-1.2.2/Imath/Makefile.am.165729 2005-03-07 22:21:53.000000000 -0600
++++ OpenEXR-1.2.2/Imath/Makefile.am 2006-02-09 22:43:41.000000000 -0600
+@@ -15,7 +15,8 @@
+ ImathFrame.h ImathPlatform.h \
+ ImathBox.cpp ImathRandom.cpp
+
+-libImath_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
++libImath_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined -Wl,--no-undefined
++libImath_la_LIBADD = ../Iex/libIex.la
+
+ libImathincludedir = $(includedir)/OpenEXR
+
+--- OpenEXR-1.2.2/Iex/Makefile.am.165729 2004-02-05 23:22:01.000000000 -0600
++++ OpenEXR-1.2.2/Iex/Makefile.am 2006-02-09 22:42:18.000000000 -0600
+@@ -6,7 +6,7 @@
+ IexErrnoExc.h Iex.h IexMacros.h IexMathExc.h \
+ IexThrowErrnoExc.h
+
+-libIex_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
++libIex_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined -Wl,--no-undefined
+
+ libIexincludedir = $(includedir)/OpenEXR
+
Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenEXR.spec 17 Aug 2005 22:50:49 -0000 1.6
+++ OpenEXR.spec 19 Feb 2006 04:23:06 -0000 1.7
@@ -1,6 +1,6 @@
Name: OpenEXR
Version: 1.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A high dynamic-range (HDR) image file format
Group: System Environment/Libraries
@@ -11,7 +11,7 @@
Patch1: %{name}-1.2.2-forwardfriend.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fltk-devel >= 1.1 zlib-devel
+BuildRequires: fltk-devel >= 1.1 zlib-devel automake libtool autoconf
%description
OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -31,6 +31,7 @@
%setup -q
%patch -p1 -b .zlib
%patch1 -p1 -b .forwardfriend
+./bootstrap
%build
%configure --disable-static
@@ -66,6 +67,9 @@
%{_libdir}/pkgconfig/*
%changelog
+* Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-6
+- Further zlib fixes (#165729)
+
* Wed Aug 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-5
- Remove *.a from %%files devel
More information about the scm-commits
mailing list