rpms/esorex/F-7 esorex-configure.patch, NONE, 1.1 esorex-pluginpath.patch, NONE, 1.1 esorex.spec, NONE, 1.1 sources, 1.1, 1.2

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/esorex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19604

Modified Files:
	sources 
Added Files:
	esorex-configure.patch esorex-pluginpath.patch esorex.spec 
Log Message:
Importing into F-7


esorex-configure.patch:

--- NEW FILE esorex-configure.patch ---
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 @@
 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_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

esorex-pluginpath.patch:

--- NEW FILE esorex-pluginpath.patch ---
diff -ur esorex-3.6.1/src/er_main.c esorex-3.6.1.new/src/er_main.c
--- esorex-3.6.1/src/er_main.c	2007-01-25 10:03:32.000000000 +0100
+++ esorex-3.6.1.new/src/er_main.c	2007-04-27 18:35:48.000000000 +0200
@@ -227,7 +227,7 @@
                              "Multiple directory heads may be "
                              "specified, by separating the "
                              "starting paths with colons (:).",
-                             PACKAGE_RESOURCE, ".");
+                             PACKAGE_RESOURCE, "/usr/lib/cplrecipes");
 cpl_parameter_set_alias (p, CPL_PARAMETER_MODE_CLI, "recipe-dir");
 cpl_parameter_set_alias (p, CPL_PARAMETER_MODE_ENV,
                          PACKAGE_ENV "_PLUGIN_DIR");


--- NEW FILE esorex.spec ---
Name: esorex
Version: 3.6.1
Release: 2%{?dist}
Summary: EsoRex is the European Southern Observatory Recipe Execution Tool

Group: Applications/Engineering
License: GPLv2+
URL: http://www.eso.org/observing/cpl/esorex.html
Source0: ftp://ftp.hq.eso.org/pub/cpl/%{name}-%{version}.tar.gz
Patch0: esorex-configure.patch
# This patch sets the directory where the recipes (shared libraries) 
# are installed
Patch1: esorex-pluginpath.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: cpl-devel

%description
EsoRex is the ESO Recipe Execution Tool. It can list, configure and 
execute CPL-based recipes from the command line.
One of the features provided by the CPL is the ability to create 
data-reduction algorithms that run as plugins (dynamic libraries). These 
are called recipes and are one of the main aspects of the 
CPL data-reduction development environment.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%clean
%{__rm} -fr %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS COPYING README BUGS ChangeLog
%{_bindir}/*
%{_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

* Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.1-0.3
- Updated license tag to follow Fedora guidelines

* Fri Apr 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.1-0.2
- The recipe dir is predefined in the patch (esorex-pluginpath.patch)

* Thu Apr 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.1-0.1
- Initial spec file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2007 17:05:15 -0000	1.1
+++ sources	21 Nov 2007 18:01:10 -0000	1.2
@@ -0,0 +1 @@
+1221a0cf3d366767b768824036dc0681  esorex-3.6.1.tar.gz