[cpl] New upstream source 6.2

[Sergio Pascual]

commit df70447eeaae6477e8a9616051abcd99be808532
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Thu Feb 14 10:43:43 2013 +0100

    New upstream source 6.2
    
    - Updated URL and Source0 URL
    - Merged patches

 .gitignore           |    1 +
 cpl-alldyn.patch     |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++
 cpl-cfitsiodyn.patch |   30 ---------------------
 cpl-fftwdyn.patch    |   25 -----------------
 cpl-wcslibdyn.patch  |   23 ----------------
 cpl.spec             |   19 +++++++------
 sources              |    2 +-
 7 files changed, 83 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8adfd1..554fdc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 cpl-5.2.0.tar.gz
 /cpl-5.3.1.tar.gz
+/cpl-6.2.tar.gz
diff --git a/cpl-alldyn.patch b/cpl-alldyn.patch
new file mode 100644
index 0000000..d8b41ba
--- /dev/null
+++ b/cpl-alldyn.patch
@@ -0,0 +1,71 @@
+diff -ur cpl-6.2/configure cpl-6.2dyn/configure
+--- cpl-6.2/configure	2012-11-09 13:46:24.000000000 +0100
++++ cpl-6.2dyn/configure	2013-02-14 10:23:48.338634600 +0100
+@@ -14252,7 +14252,7 @@
+ 
+     cpl_cfitsio_check_version="3.270"
+     cpl_cfitsio_check_header="fitsio.h"
+-    cpl_cfitsio_check_lib="libcfitsio.a"
++    cpl_cfitsio_check_lib="libcfitsio.so"
+ 
+     cpl_cfitsio_incdirs=""
+     cpl_cfitsio_libdirs=""
+@@ -14311,6 +14311,7 @@
+ 
+                 # Try some known system locations
+ 
++                cpl_cfitsio_incdirs="$includedir/cfitsio"
+                 cpl_cfitsio_incdirs="/opt/cfitsio/include"
+                 cpl_cfitsio_incdirs="$cpl_cfitsio_incdirs /usr/local/include/libcfitsio0"
+                 cpl_cfitsio_incdirs="$cpl_cfitsio_incdirs /usr/local/include/cfitsio"
+@@ -14369,7 +14370,7 @@
+ 
+                 # Try some known system locations
+ 
+-                cpl_cfitsio_libdirs="/opt/cfitsio/lib"
++                cpl_cfitsio_libdirs="$libdir"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/local/lib64"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/local/lib"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/local/lib32"
+@@ -14905,7 +14906,7 @@
+ 
+     cpl_wcs_check_version="4.4.4"
+     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=""
+@@ -14966,8 +14967,10 @@
+     fi
+ 
+ 
++    cpl_wcs_incdirs="$includedir"
+     cpl_wcs_includes=no
+ 
++    cpl_wcs_libdirs="$libdir"
+     for i in $cpl_wcs_incdirs; do
+         for j in $cpl_wcs_check_header; do
+ 
+@@ -15207,8 +15210,8 @@
+ 
+ 	cpl_fftw_check_version="3.1.2"
+     cpl_fftw_check_header="fftw3.h"
+-    cpl_fftw_check_lib="libfftw3.a"
+-    cpl_fftwf_check_lib="libfftw3f.a"
++    cpl_fftw_check_lib="libfftw3.so"
++    cpl_fftwf_check_lib="libfftw3f.so"
+ 
+     cpl_fftw_includes=""
+     cpl_fftw_libraries=""
+@@ -15271,8 +15274,10 @@
+     fi
+ 
+ 
++    cpl_fftw_incdirs="$includedir"
+     cpl_fftw_includes=no
+ 
++    cpl_fftw_libdirs="$libdir"
+     for i in $cpl_fftw_incdirs; do
+         for j in $cpl_fftw_check_header; do
+ 
diff --git a/cpl.spec b/cpl.spec
index f553b6e..9a364cc 100644
--- a/cpl.spec
+++ b/cpl.spec
@@ -1,16 +1,14 @@
 Name: cpl
-Version: 5.3.1
-Release: 6%{?dist}
+Version: 6.2
+Release: 1%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
 License: GPLv2+
-URL: http://www.eso.org/observing/cpl
-Source0: ftp://ftp.eso.org/pub/cpl/%{name}-%{version}.tar.gz
+URL: http://www.eso.org/sci/software/cpl/
+Source0: ftp://ftp.eso.org/pub/dfs/pipelines/libraries/%{name}-%{version}.tar.gz
 # Informed upstream 2008-12-18
-Patch0: cpl-cfitsiodyn.patch
-Patch1: cpl-wcslibdyn.patch
-Patch2: cpl-fftwdyn.patch
+Patch0: cpl-alldyn.patch
 
 BuildRequires: cfitsio-devel wcslib-devel fftw-devel
 
@@ -34,8 +32,6 @@ application
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure --disable-static
@@ -63,6 +59,11 @@ make DESTDIR=%{buildroot} install
 %exclude %{_libdir}/*.la
 
 %changelog
+* Thu Feb 14 2013 Sergio Pascual <sergiopr at lfedoraproject.org> - 6.2-1
+- New upstream source 6.2
+- Updated URL and Source0 URL
+- Merged patches
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 31ced9d..457003a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d26beefcfc3dc52bbf614b46440cfa37  cpl-5.3.1.tar.gz
+4421b0134a48b4c73bf095916cfabb31  cpl-6.2.tar.gz