[esorex/el6/master] Pull from master

[Lubomir Rintel]

commit caff519ab1f01f04a0e37609f0d10e4f03848081
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Aug 3 21:23:10 2010 +0200

    Pull from master

 .gitignore       |    1 +
 esorex-dso.patch |   12 ++++++++++++
 esorex.spec      |   13 ++++++++++++-
 3 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d1f7cd..6c59dfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 esorex-3.6.12.tar.gz
+esorex-3.7.2.tar.gz
diff --git a/esorex-dso.patch b/esorex-dso.patch
new file mode 100644
index 0000000..9b5da64
--- /dev/null
+++ b/esorex-dso.patch
@@ -0,0 +1,12 @@
+diff -ur esorex-3.7.2/src/Makefile.in esorex-3.7.2.new/src/Makefile.in
+--- esorex-3.7.2/src/Makefile.in	2009-03-31 17:40:47.000000000 +0200
++++ esorex-3.7.2.new/src/Makefile.in	2010-02-18 18:18:35.000000000 +0100
+@@ -258,7 +258,7 @@
+ EXTRA_esorex_SOURCES = getopt.c getopt1.c getopt.h
+ config_DATA = 
+ esorex_LDFLAGS = $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) $(LIBLTDL)
+-esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL)
++esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBCPLCORE) $(LIBLTDL) -lcfitsio -lm -lcext
+ esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
+ all: all-recursive
+ 
diff --git a/esorex.spec b/esorex.spec
index fd58c02..2d15593 100644
--- a/esorex.spec
+++ b/esorex.spec
@@ -1,6 +1,6 @@
 Name: esorex
 Version: 3.7.2
-Release: 5%{?dist}
+Release: 8%{?dist}
 Summary: Recipe Execution Tool of the European Southern Observatory 
 
 Group: Applications/Engineering
@@ -9,6 +9,7 @@ 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
 Patch1: esorex-ltdl.patch
+Patch2: esorex-dso.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cpl-devel
@@ -26,6 +27,7 @@ CPL data-reduction development environment.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure  --with-cpl-libs=%{_libdir}
@@ -45,6 +47,15 @@ rm -rf %{buildroot}
 %{_datadir}/*
 
 %changelog
+* Thu Feb 18 2010 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-8
+- Patch modified, adding -lcfitsio and -lcext
+
+* Thu Feb 18 2010 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-7
+- EVR bump to allow rebuilding
+
+* Thu Feb 18 2010 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-6
+- Patch to fix implicit DSO linking problem, bz #564901
+
 * Wed Feb 17 2010 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-5
 - Patch to ltdl, fixes security problem CVE-2009-3736, bz #563969