rpms/OpenEXR/devel openexr-1.4.0-pkgconfig.patch, NONE, 1.1 OpenEXR.spec, 1.11, 1.12 openexr-1.4.0-no_undefined.patch, 1.1, 1.2

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	OpenEXR.spec openexr-1.4.0-no_undefined.patch 
Added Files:
	openexr-1.4.0-pkgconfig.patch 
Log Message:
* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0a-3
- pkgconfig patch to use Libs.private


openexr-1.4.0-pkgconfig.patch:

--- NEW FILE openexr-1.4.0-pkgconfig.patch ---
--- openexr-1.4.0/OpenEXR.pc.in.pkgconfig	2006-08-09 00:37:49.000000000 -0500
+++ openexr-1.4.0/OpenEXR.pc.in	2006-09-14 09:05:11.000000000 -0500
@@ -7,5 +7,6 @@
 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
+Libs.private: -lz @PTHREAD_LIBS@
+Cflags: -I${OpenEXR_includedir}


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/devel/OpenEXR.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- OpenEXR.spec	14 Sep 2006 14:01:36 -0000	1.11
+++ OpenEXR.spec	14 Sep 2006 14:09:25 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:	 OpenEXR
 Version: %{ver}%{?beta} 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A high dynamic-range (HDR) image file format
 
 Group:	 System Environment/Libraries
@@ -15,6 +15,8 @@
 
 # FIXME: IlmThread contains undefined references to stuff in -lpthread
 Patch1: openexr-1.4.0-no_undefined.patch
+# Use Libs.private
+Patch2: openexr-1.4.0-pkgconfig.patch
 
 BuildRequires:  fltk-devel >= 1.1
 BuildRequires:  zlib-devel
@@ -39,6 +41,9 @@
 %setup -q -n openexr-%{ver}
 
 %patch1 -p1 -b .no_undefined
+%patch2 -p1 -b .pkgconfig
+
+# for patch1
 ./bootstrap
 
 
@@ -91,6 +96,9 @@
 
 
 %changelog
+* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0a-3
+- pkgconfig patch to use Libs.private
+
 * Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0a-2
 - -devel: +Requires: pkgconfig
 

openexr-1.4.0-no_undefined.patch:

Index: openexr-1.4.0-no_undefined.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/devel/openexr-1.4.0-no_undefined.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openexr-1.4.0-no_undefined.patch	11 Sep 2006 00:22:37 -0000	1.1
+++ openexr-1.4.0-no_undefined.patch	14 Sep 2006 14:09:25 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- openexr-1.4.0/acinclude.m4.no_undefined	2005-08-23 12:13:04.000000000 -0500
++++ openexr-1.4.0/acinclude.m4	2006-09-14 09:03:52.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.
@@ -9,13 +9,3 @@
  
  # 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}