rpms/esorex/devel .cvsignore, 1.5, 1.6 esorex-configure.patch, 1.4, 1.5 esorex.spec, 1.13, 1.14 sources, 1.5, 1.6

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/esorex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1003

Modified Files:
	.cvsignore esorex-configure.patch esorex.spec sources 
Log Message:
* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-1
- New upstream source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Dec 2008 20:23:15 -0000	1.5
+++ .cvsignore	28 Oct 2009 17:19:49 -0000	1.6
@@ -1 +1 @@
-esorex-3.6.12.tar.gz
+esorex-3.7.2.tar.gz

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

Index: esorex-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex-configure.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- esorex-configure.patch	22 Dec 2008 20:23:15 -0000	1.4
+++ esorex-configure.patch	28 Oct 2009 17:19:49 -0000	1.5
@@ -1,8 +1,8 @@
-diff -ur esorex-3.6.12/configure esorex-3.6.12.new/configure
---- esorex-3.6.12/configure	2008-10-17 11:10:28.000000000 +0200
-+++ esorex-3.6.12.new/configure	2008-12-22 21:19:44.000000000 +0100
-@@ -22587,7 +22587,7 @@
- echo $ECHO_N "checking for cfitsio... $ECHO_C" >&6; }
+diff -ur esorex-3.7.2/configure esorex-3.7.2.new/configure
+--- esorex-3.7.2/configure	2009-03-31 17:40:42.000000000 +0200
++++ esorex-3.7.2.new/configure	2009-10-28 18:16:12.000000000 +0100
+@@ -14007,7 +14007,7 @@
+ $as_echo_n "checking for cfitsio... " >&6; }
  
      cpl_cfitsio_check_header="fitsio.h"
 -    cpl_cfitsio_check_lib="libcfitsio.a"
@@ -10,30 +10,20 @@ diff -ur esorex-3.6.12/configure esorex-
  
      cpl_cfitsio_includes=""
      cpl_cfitsio_libraries=""
-@@ -22630,7 +22630,7 @@
-         # Check for the cfitsio includes
+@@ -14061,7 +14061,7 @@
+             cpl_cfitsio_incdirs="$cpl_with_cfitsio_includes"
+         fi
  
-         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"
-@@ -22662,7 +22662,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"
-@@ -22740,7 +22740,7 @@
- echo $ECHO_N "checking for CPL... $ECHO_C" >&6; }
- 
-     cpl_check_cpl_header="cpl_macros.h"
--    cpl_check_cpl_lib="libcplcore.la"
-+    cpl_check_cpl_lib="libcplcore.so"
+-
++    cpl_cfitsio_incdirs="$includedir/cfitsio"
+     cpl_cfitsio_includes=no
  
-     cpl_includes=""
-     cpl_libraries=""
+     for i in $cpl_cfitsio_incdirs; do
+@@ -14094,6 +14094,7 @@
+         fi
+ 
+ 
++    cpl_cfitsio_libdirs="$libdir"
+     cpl_cfitsio_libraries=no
+ 
+     for i in $cpl_cfitsio_libdirs; do


Index: esorex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- esorex.spec	24 Jul 2009 22:18:01 -0000	1.13
+++ esorex.spec	28 Oct 2009 17:19:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name: esorex
-Version: 3.6.12
-Release: 4%{?dist}
+Version: 3.7.2
+Release: 1%{?dist}
 Summary: Recipe Execution Tool of the European Southern Observatory 
 
 Group: Applications/Engineering
@@ -10,7 +10,7 @@ Source0: ftp://ftp.hq.eso.org/pub/cpl/%{
 Patch0: esorex-configure.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: cpl-devel
+BuildRequires: cpl-devel > 5.0
 
 %description
 EsoRex is the ESO Recipe Execution Tool. It can list, configure and 
@@ -26,22 +26,25 @@ CPL data-reduction development environme
 
 %build
 %configure  --with-cpl-libs=%{_libdir}
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README BUGS ChangeLog
 %{_bindir}/*
 %{_datadir}/*
 
 %changelog
+* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-1
+- New upstream source
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Dec 2008 20:23:15 -0000	1.5
+++ sources	28 Oct 2009 17:19:49 -0000	1.6
@@ -1 +1 @@
-a33a62d5ea4fc53ce115d8c89a2da490  esorex-3.6.12.tar.gz
+75706ba4956e3b7c37537f714e040ef1  esorex-3.7.2.tar.gz