rpms/esorex/devel .cvsignore, 1.2, 1.3 esorex-configure.patch, 1.2, 1.3 esorex.spec, 1.3, 1.4 sources, 1.2, 1.3

[Sergio Pascual (sergiopr)]

Author: sergiopr

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

Modified Files:
	.cvsignore esorex-configure.patch esorex.spec sources 
Log Message:
* Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 3.6.6-1
- New upstream source, uses cpl > 4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Nov 2007 17:10:20 -0000	1.2
+++ .cvsignore	9 Feb 2008 17:22:49 -0000	1.3
@@ -1 +1 @@
-esorex-3.6.1.tar.gz
+esorex-3.6.6.tar.gz

esorex-configure.patch:

Index: esorex-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex-configure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- esorex-configure.patch	21 Nov 2007 17:41:18 -0000	1.2
+++ esorex-configure.patch	9 Feb 2008 17:22:49 -0000	1.3
@@ -1,25 +1,34 @@
-diff -ur esorex-3.6.1/configure esorex-3.6.1.new/configure
---- esorex-3.6.1/configure	2007-01-29 13:00:54.000000000 +0100
-+++ esorex-3.6.1.new/configure	2007-11-21 18:34:25.000000000 +0100
-@@ -21371,7 +21371,7 @@
- echo $ECHO_N "checking for Qfits... $ECHO_C" >&6
- 
-     cpl_qfits_check_header="qfits.h"
--    cpl_qfits_check_lib="libqfits.a"
-+    cpl_qfits_check_lib="libqfits.so"
- 
-     cpl_qfits_includes=""
-     cpl_qfits_libraries=""
-@@ -21446,7 +21446,7 @@
-         # Check for the Qfits library
- 
-         if test -z "$cpl_with_qfits_libs"; then
--            cpl_qfits_libdirs="/opt/qfits/lib /usr/local/lib /usr/lib"
-+            cpl_qfits_libdirs="/opt/qfits/lib /usr/local/lib $libdir"
- 
-             test -n "$CPLDIR" && cpl_qfits_libdirs="$CPLDIR/lib \
-                                                     $cpl_qfits_libdirs"
-@@ -21629,7 +21629,7 @@
+diff -ur esorex-3.6.6/configure esorex-3.6.6.new/configure
+--- esorex-3.6.6/configure	2007-11-06 10:07:37.000000000 +0100
++++ esorex-3.6.6.new/configure	2007-11-09 16:52:45.000000000 +0100
+@@ -21472,7 +21472,7 @@
+ echo $ECHO_N "checking for cfitsio... $ECHO_C" >&6
+ 
+     cpl_cfitsio_check_header="fitsio.h"
+-    cpl_cfitsio_check_lib="libcfitsio.a"
++    cpl_cfitsio_check_lib="libcfitsio.so"
+ 
+     cpl_cfitsio_includes=""
+     cpl_cfitsio_libraries=""
+@@ -21515,7 +21515,7 @@
+         # Check for the cfitsio includes
+ 
+         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"
+ 
+             test -n "$CPLDIR" && cpl_cfitsio_incdirs="$CPLDIR/include \
+                 $cpl_cfitsio_incdirs"
+@@ -21547,7 +21547,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"
+@@ -21626,7 +21626,7 @@
  echo $ECHO_N "checking for CPL... $ECHO_C" >&6
  
      cpl_check_cpl_header="cpl_macros.h"
@@ -28,12 +37,3 @@
  
      cpl_includes=""
      cpl_libraries=""
-@@ -21708,7 +21708,7 @@
-             cpl_libdirs="/opt/cpl/lib \
-                          /usr/local/lib \
-                          /usr/local/cpl/lib \
--                         /usr/lib"
-+                         $libdir"
- 
-             test -n "$CPLDIR" && cpl_libdirs="$CPLDIR/lib $cpl_libdirs"
-         else


Index: esorex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esorex.spec	21 Nov 2007 17:41:18 -0000	1.3
+++ esorex.spec	9 Feb 2008 17:22:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name: esorex
-Version: 3.6.1
-Release: 2%{?dist}
+Version: 3.6.6
+Release: 1%{?dist}
 Summary: EsoRex is the European Southern Observatory Recipe Execution Tool
 
 Group: Applications/Engineering
@@ -13,7 +13,7 @@
 Patch1: esorex-pluginpath.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: cpl-devel
+BuildRequires: cpl-devel >= 4.0
 
 %description
 EsoRex is the ESO Recipe Execution Tool. It can list, configure and 
@@ -46,12 +46,8 @@
 %{_datadir}/*
 
 %changelog
-* Wed Nov 21 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.6.1-2
-- Modified configure to build in x86_64
-
-* Wed Nov 21 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.6.1-1
-- Accepted in Fedora
-- Changed buildroot
+* Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 3.6.6-1
+- New upstream source, uses cpl > 4.0
 
 * Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.1-0.3
 - Updated license tag to follow Fedora guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Nov 2007 17:10:20 -0000	1.2
+++ sources	9 Feb 2008 17:22:49 -0000	1.3
@@ -1 +1 @@
-1221a0cf3d366767b768824036dc0681  esorex-3.6.1.tar.gz
+89c110a02b9e2203b1116884475f483c  esorex-3.6.6.tar.gz