rpms/cpl/F-12 cpl-cfitsiodyn.patch, 1.3, 1.4 cpl-wcslibdyn.patch, 1.1, 1.2 cpl.spec, 1.10, 1.11 cpl-multilib.patch, 1.2, NONE

Thu Oct 29 11:50:27 UTC 2009

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30245

Modified Files:
	cpl-cfitsiodyn.patch cpl-wcslibdyn.patch cpl.spec 
Removed Files:
	cpl-multilib.patch 
Log Message:
* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1
- New upstream source


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

Index: cpl-cfitsiodyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-12/cpl-cfitsiodyn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- cpl-cfitsiodyn.patch	18 Dec 2008 19:04:07 -0000	1.3
+++ cpl-cfitsiodyn.patch	29 Oct 2009 11:50:27 -0000	1.4
@@ -1,21 +1,30 @@
-diff -ur cpl-4.2.0/configure cpl-4.2.0-new/configure
---- cpl-4.2.0/configure	2008-08-06 14:47:07.000000000 +0200
-+++ cpl-4.2.0-new/configure	2008-12-18 19:17:06.000000000 +0100
-@@ -21100,7 +21100,7 @@
- echo $ECHO_N "checking for cfitsio... $ECHO_C" >&6; }
+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 @@
  
      cpl_cfitsio_check_header="fitsio.h"
+     # FIXME: Check first for the dynamic library...
 -    cpl_cfitsio_check_lib="libcfitsio.a"
 +    cpl_cfitsio_check_lib="libcfitsio.so"
  
-     cpl_cfitsio_includes=""
-     cpl_cfitsio_libraries=""
-@@ -21160,6 +21160,8 @@
-         done
-     done
+     cpl_cfitsio_dir=""
+     cpl_cfitsio_incdirs=""
+@@ -20432,7 +20432,7 @@
  
-+cpl_cfitsio_includes=/usr/include/cfitsio
-+cpl_cfitsio_libraries=$libdir
+     # Check for the cfitsio includes, either in include/, include/cfitsio/
+     # or include/libcfitsio0/
+-    cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include"
++    cpl_cfitsio_incdirs="$includedir/cfitsio"
+ 
+     cpl_cfitsio_includes=no
+ 
+@@ -20491,7 +20491,7 @@
+     fi
+ 
+     # Check for the cfitsio library, either in lib64/, lib32/ or lib/
+-    cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib64"
++    cpl_cfitsio_libdirs="$libdir"
+ 
+     cpl_cfitsio_libraries=no
  
-     if test x"$cpl_cfitsio_includes" = xno || test x"$cpl_cfitsio_libraries" = xno; then
-         { { echo "$as_me:$LINENO: error: cfitsio was not found on your system. Please check!" >&5

cpl-wcslibdyn.patch:
 configure |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: cpl-wcslibdyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-12/cpl-wcslibdyn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpl-wcslibdyn.patch	8 May 2009 11:56:50 -0000	1.1
+++ cpl-wcslibdyn.patch	29 Oct 2009 11:50:27 -0000	1.2
@@ -1,8 +1,8 @@
-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; }
+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
  
      cpl_wcs_check_header="wcslib/wcslib.h"
 -    cpl_wcs_check_lib="libwcs.a"
@@ -10,12 +10,20 @@ diff -ur cpl-4.2.0/configure cpl-4.2.0.n
  
      cpl_wcs_includes=""
      cpl_wcs_libraries=""
-@@ -21252,6 +21252,8 @@
-         done
-     done
+@@ -20608,6 +20608,7 @@
+         cpl_wcs_incdirs="$cpl_with_wcs_includes"
+     fi
  
-+cpl_wcs_includes="/usr/include"
-+cpl_wcs_libraries=$libdir
++    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
  
-     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/F-12/cpl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cpl.spec	24 Jul 2009 19:33:07 -0000	1.10
+++ cpl.spec	29 Oct 2009 11:50:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cpl
-Version: 4.2.0
-Release: 4%{?dist}
+Version: 5.0.1
+Release: 1%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -9,8 +9,7 @@ URL: http://www.eso.org/observing/cpl
 Source0: ftp://ftp.hq.eso.org/pub/cpl/%{name}-%{version}.tar.gz
 # Informed upstream 2008-12-18
 Patch0: cpl-cfitsiodyn.patch
-Patch1: cpl-multilib.patch
-Patch2: cpl-wcslibdyn.patch
+Patch1: cpl-wcslibdyn.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cfitsio-devel wcslib-devel
@@ -37,21 +36,17 @@ application
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{_libdir}/cplrecipes
-%{__install} -m 644 libcext/cext/cxtypes-32.h %{buildroot}%{_includedir} || :
-%{__install} -m 644 libcext/cext/cxtypes-64.h %{buildroot}%{_includedir} || :
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -59,9 +54,8 @@ application
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS
+%doc AUTHORS BUGS COPYING NEWS
 %{_libdir}/*so.*
-%{_libdir}/cplrecipes
 
 %files devel
 %defattr(-,root,root,-)
@@ -71,6 +65,9 @@ application
 %exclude %{_libdir}/*.la
 
 %changelog
+* 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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- cpl-multilib.patch DELETED ---


