rpms/esorex/devel esorex-configure.patch, 1.1, 1.2 esorex.spec, 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-serv18114

Modified Files:
	esorex-configure.patch esorex.spec 
Log Message:
* Wed Nov 21 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.6.1-2
- Modified configure to build in x86_64


esorex-configure.patch:

Index: esorex-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- esorex-configure.patch	21 Nov 2007 17:10:20 -0000	1.1
+++ esorex-configure.patch	21 Nov 2007 17:41:18 -0000	1.2
@@ -1,6 +1,6 @@
 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-04-26 17:49:42.000000000 +0200
++++ 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
  
@@ -10,6 +10,15 @@
  
      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 @@
  echo $ECHO_N "checking for CPL... $ECHO_C" >&6
  
@@ -19,3 +28,12 @@
  
      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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- esorex.spec	21 Nov 2007 17:14:26 -0000	1.2
+++ esorex.spec	21 Nov 2007 17:41:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name: esorex
 Version: 3.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: EsoRex is the European Southern Observatory Recipe Execution Tool
 
 Group: Applications/Engineering
@@ -46,6 +46,9 @@
 %{_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