rpms/cpl/devel cpl-wcslibdyn.patch,NONE,1.1 cpl.spec,1.8,1.9

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7141

Modified Files:
	cpl.spec 
Added Files:
	cpl-wcslibdyn.patch 
Log Message:
* Fri May 08 2009 Sergio Pascual <sergiopr at fedoraproject.org> 4.2.0-3
- Enabled wcslib support


cpl-wcslibdyn.patch:

--- NEW FILE cpl-wcslibdyn.patch ---
diff -ur cpl-4.2.0/configure cpl-4.2.0.new/configure
--- cpl-4.2.0/configure	2009-05-08 13:41:07.000000000 +0200
+++ cpl-4.2.0.new/configure	2009-05-08 13:39:53.000000000 +0200
@@ -21192,7 +21192,7 @@
 echo $ECHO_N "checking for wcs... $ECHO_C" >&6; }
 
     cpl_wcs_check_header="wcslib/wcslib.h"
-    cpl_wcs_check_lib="libwcs.a"
+    cpl_wcs_check_lib="libwcs.so"
 
     cpl_wcs_includes=""
     cpl_wcs_libraries=""
@@ -21252,6 +21252,8 @@
         done
     done
 
+cpl_wcs_includes="/usr/include"
+cpl_wcs_libraries=$libdir
 
     if test x"$cpl_wcs_includes" = xno || test x"$cpl_wcs_libraries" = xno; then
         { echo "$as_me:$LINENO: WARNING: wcs was not found on your system." >&5


Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cpl.spec	24 Feb 2009 09:24:45 -0000	1.8
+++ cpl.spec	8 May 2009 11:56:50 -0000	1.9
@@ -1,6 +1,6 @@
 Name: cpl
 Version: 4.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -10,9 +10,10 @@ Source0: ftp://ftp.hq.eso.org/pub/cpl/%{
 # Informed upstream 2008-12-18
 Patch0: cpl-cfitsiodyn.patch
 Patch1: cpl-multilib.patch
+Patch2: cpl-wcslibdyn.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: cfitsio-devel
+BuildRequires: cfitsio-devel wcslib-devel
 
 %description
 The Common Pipeline Library (CPL) comprises a set of ISO-C libraries 
@@ -36,6 +37,7 @@ application
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-static
@@ -69,6 +71,9 @@ application
 %exclude %{_libdir}/*.la
 
 %changelog
+* Fri May 08 2009 Sergio Pascual <sergiopr at fedoraproject.org> 4.2.0-3
+- Enabled wcslib support
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild