rpms/cpl/devel .cvsignore, 1.4, 1.5 cpl-cfitsiodyn.patch, 1.1, 1.2 cpl.spec, 1.5, 1.6 sources, 1.4, 1.5

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9180

Modified Files:
	.cvsignore cpl-cfitsiodyn.patch cpl.spec sources 
Log Message:
* Sun Apr 06 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.1.0-1
- New upstream source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Feb 2008 16:06:54 -0000	1.4
+++ .cvsignore	6 Apr 2008 16:11:05 -0000	1.5
@@ -1 +1 @@
-cpl-4.0.1.tar.gz
+cpl-4.1.0.tar.gz

cpl-cfitsiodyn.patch:

Index: cpl-cfitsiodyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl-cfitsiodyn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpl-cfitsiodyn.patch	9 Feb 2008 15:57:58 -0000	1.1
+++ cpl-cfitsiodyn.patch	6 Apr 2008 16:11:05 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur cpl-4.0/configure cpl-4.0.new/configure
---- cpl-4.0/configure	2007-09-11 15:04:39.000000000 +0200
-+++ cpl-4.0.new/configure	2007-11-09 15:55:17.000000000 +0100
-@@ -20184,7 +20184,7 @@
+diff -ur cpl-4.1.0/configure cpl-4.1.0.new/configure
+--- cpl-4.1.0/configure	2008-03-06 17:28:39.000000000 +0100
++++ cpl-4.1.0.new/configure	2008-04-06 18:01:26.000000000 +0200
+@@ -20406,7 +20406,7 @@
  echo $ECHO_N "checking for cfitsio... $ECHO_C" >&6
  
      cpl_cfitsio_check_header="fitsio.h"
@@ -10,21 +10,20 @@
  
      cpl_cfitsio_includes=""
      cpl_cfitsio_libraries=""
-@@ -20227,7 +20227,7 @@
-         # Check for the cfitsio includes
+@@ -20443,7 +20443,6 @@
+         done
+     done
+ 
+-
+     # Check for the cfitsio library
+     if test -z "$cpl_with_cfitsio_libs"; then
+         test -n "$CFITSIODIR" && cpl_cfitsio_libdirs="$CFITSIODIR/lib"
+@@ -20466,6 +20465,8 @@
+         done
+     done
  
-         if test -z "$cpl_with_cfitsio_includes"; then
--            cpl_cfitsio_incdirs="/opt/cfitsio/include /usr/local/include /usr/include"
-+            cpl_cfitsio_incdirs="/opt/cfitsio/include /usr/local/include /usr/include /usr/include/cfitsio"
++cpl_cfitsio_includes=/usr/include/cfitsio
++cpl_cfitsio_libraries=$libdir
  
-             test -n "$CPLDIR" && cpl_cfitsio_incdirs="$CPLDIR/include \
-                 $cpl_cfitsio_incdirs"
-@@ -20259,7 +20259,7 @@
-         # Check for the cfitsio library
- 
-         if test -z "$cpl_with_cfitsio_libs"; then
--            cpl_cfitsio_libdirs="/opt/cfitsio/lib /usr/local/lib /usr/lib"
-+            cpl_cfitsio_libdirs="/opt/cfitsio/lib /usr/local/lib $libdir"
- 
-             test -n "$CPLDIR" && cpl_cfitsio_libdirs="$CPLDIR/lib \
-                 $cpl_cfitsio_libdirs"
+     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


Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpl.spec	9 Feb 2008 17:02:38 -0000	1.5
+++ cpl.spec	6 Apr 2008 16:11:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name: cpl
-Version: 4.0.1
-Release: 2%{?dist}
+Version: 4.1.0
+Release: 1%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -68,6 +68,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 06 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.1.0-1
+- New upstream source
+
 * Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.0.1-2
 - Updated upstream sources.
 - Fixing multilib bug (bz#340941)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Feb 2008 16:06:54 -0000	1.4
+++ sources	6 Apr 2008 16:11:05 -0000	1.5
@@ -1 +1 @@
-c8e63ee7cecba18720d1c78a21132065  cpl-4.0.1.tar.gz
+006935c68cb23a1a5b80565836cd116f  cpl-4.1.0.tar.gz