rpms/cpl/devel cpl-cfitsiodyn.patch, 1.4, 1.5 cpl-wcslibdyn.patch, 1.2, 1.3 cpl.spec, 1.13, 1.14

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2759

Modified Files:
	cpl-cfitsiodyn.patch cpl-wcslibdyn.patch cpl.spec 
Log Message:
* Wed Mar 10 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 5.0.1-3
- Rebuilt to match new cfitsio 3.240


cpl-cfitsiodyn.patch:
 configure |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: cpl-cfitsiodyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl-cfitsiodyn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cpl-cfitsiodyn.patch	28 Oct 2009 16:51:01 -0000	1.4
+++ cpl-cfitsiodyn.patch	21 May 2010 21:32:54 -0000	1.5
@@ -1,7 +1,7 @@
-diff -ur cpl-5.0.1/configure cpl-5.0.1.new/configure
---- cpl-5.0.1/configure	2009-05-06 15:27:54.000000000 +0200
-+++ cpl-5.0.1.new/configure	2009-10-28 17:37:32.000000000 +0100
-@@ -20407,7 +20407,7 @@
+diff -ur cpl-5.2.0/configure cpl-5.2.0.new/configure
+--- cpl-5.2.0/configure	2010-05-19 09:07:01.000000000 +0200
++++ cpl-5.2.0.new/configure	2010-05-21 23:16:27.657059205 +0200
+@@ -13178,7 +13178,7 @@
  
      cpl_cfitsio_check_header="fitsio.h"
      # FIXME: Check first for the dynamic library...
@@ -10,7 +10,7 @@ diff -ur cpl-5.0.1/configure cpl-5.0.1.n
  
      cpl_cfitsio_dir=""
      cpl_cfitsio_incdirs=""
-@@ -20432,7 +20432,7 @@
+@@ -13203,7 +13203,7 @@
  
      # Check for the cfitsio includes, either in include/, include/cfitsio/
      # or include/libcfitsio0/
@@ -19,7 +19,7 @@ diff -ur cpl-5.0.1/configure cpl-5.0.1.n
  
      cpl_cfitsio_includes=no
  
-@@ -20491,7 +20491,7 @@
+@@ -13262,7 +13262,7 @@
      fi
  
      # Check for the cfitsio library, either in lib64/, lib32/ or lib/

cpl-wcslibdyn.patch:
 configure |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: cpl-wcslibdyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl-wcslibdyn.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cpl-wcslibdyn.patch	28 Oct 2009 16:51:01 -0000	1.2
+++ cpl-wcslibdyn.patch	21 May 2010 21:32:54 -0000	1.3
@@ -1,8 +1,8 @@
-diff -ur cpl-5.0.1/configure cpl-5.0.1.new/configure
---- cpl-5.0.1/configure	2009-10-28 17:37:32.000000000 +0100
-+++ cpl-5.0.1.new/configure	2009-10-28 17:39:40.000000000 +0100
-@@ -20586,7 +20586,7 @@
- echo $ECHO_N "checking for wcs... $ECHO_C" >&6
+diff -ur cpl-5.2.0/configure cpl-5.2.0.new/configure
+--- cpl-5.2.0/configure	2010-05-21 23:19:06.885131083 +0200
++++ cpl-5.2.0.new/configure	2010-05-21 23:23:24.546077917 +0200
+@@ -13357,7 +13357,7 @@
+ $as_echo_n "checking for wcs... " >&6; }
  
      cpl_wcs_check_header="wcslib/wcslib.h"
 -    cpl_wcs_check_lib="libwcs.a"
@@ -10,20 +10,14 @@ diff -ur cpl-5.0.1/configure cpl-5.0.1.n
  
      cpl_wcs_includes=""
      cpl_wcs_libraries=""
-@@ -20608,6 +20608,7 @@
+@@ -13379,8 +13379,10 @@
          cpl_wcs_incdirs="$cpl_with_wcs_includes"
      fi
  
 +    cpl_wcs_incdirs="$includedir"
      cpl_wcs_includes=no
  
-     for i in $cpl_wcs_incdirs; do
-@@ -20632,7 +20633,7 @@
-     fi
- 
-     cpl_wcs_libraries=no
--
 +    cpl_wcs_libdirs="$libdir"
-     for i in $cpl_wcs_libdirs; do
-         for j in $cpl_wcs_check_lib; do
+     for i in $cpl_wcs_incdirs; do
+         for j in $cpl_wcs_check_header; do
  


Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- cpl.spec	9 Mar 2010 23:11:52 -0000	1.13
+++ cpl.spec	21 May 2010 21:32:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name: cpl
-Version: 5.0.1
-Release: 3%{?dist}
+Version: 5.2.0
+Release: 1%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -10,7 +10,6 @@ Source0: ftp://ftp.hq.eso.org/pub/cpl/%{
 # Informed upstream 2008-12-18
 Patch0: cpl-cfitsiodyn.patch
 Patch1: cpl-wcslibdyn.patch
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cfitsio-devel wcslib-devel