[cpl/el6/master] Pull from master

[Lubomir Rintel]

commit 346778ba82e09ac3479c25c0111740fec873ac8e
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Aug 3 21:21:20 2010 +0200

    Pull from master

 .gitignore           |    1 +
 cpl-cfitsiodyn.patch |   12 ++++++------
 cpl-wcslibdyn.patch  |   22 ++++++++--------------
 cpl.spec             |   20 ++++++++++++--------
 sources              |    2 +-
 5 files changed, 28 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b87707..0d993b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cpl-4.2.0.tar.gz
+cpl-5.2.0.tar.gz
diff --git a/cpl-cfitsiodyn.patch b/cpl-cfitsiodyn.patch
index 104a460..8983b84 100644
--- a/cpl-cfitsiodyn.patch
+++ b/cpl-cfitsiodyn.patch
@@ -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.new/configure
  
      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.new/configure
  
      cpl_cfitsio_includes=no
  
-@@ -20491,7 +20491,7 @@
+@@ -13262,7 +13262,7 @@
      fi
  
      # Check for the cfitsio library, either in lib64/, lib32/ or lib/
diff --git a/cpl-wcslibdyn.patch b/cpl-wcslibdyn.patch
index aed15af..4a994e4 100644
--- a/cpl-wcslibdyn.patch
+++ b/cpl-wcslibdyn.patch
@@ -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.new/configure
  
      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
  
diff --git a/cpl.spec b/cpl.spec
index 865688e..f38f0c3 100644
--- a/cpl.spec
+++ b/cpl.spec
@@ -1,6 +1,6 @@
 Name: cpl
-Version: 5.0.1
-Release: 1%{?dist}.1
+Version: 5.2.0
+Release: 2%{?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/%{name}-%{version}.tar.gz
 # 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
 
@@ -27,9 +26,8 @@ to shorten their development cycle and to ease their maintenance.
 Summary: Libraries, includes, etc. used to develop an application with %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: cfitsio-devel
 %description devel
-This are the header files and libraries needed to develop a %{name}
+These are the header files and libraries needed to develop a %{name}
 application
 
 %prep
@@ -65,10 +63,16 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/*.la
 
 %changelog
-* Thu Oct 29 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1.1
-- ERV bump to allow building
+* Fri May 21 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2.0-2
+- New upstream source
+
+* Wed Mar 10 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 5.0.1-3
+- Rebuilt to match new cfitsio 3.240
+
+* Thu Nov 03 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 5.0.1-2
+- Rebuilt for cfitsio-3.210-2
 
-* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1
+* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 5.0.1-1
 - New upstream source
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-4
diff --git a/sources b/sources
index 5f82216..c83d3d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a7ff5de986293fd605bbce4be5ee2ee  cpl-5.0.1.tar.gz
+ed33f957aabb229ed0c0295e84e90055  cpl-5.2.0.tar.gz