From 952494831b1506e4387a976e43f41e2ceb6d7d81 Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fis.ucm.es>
Date: Dec 05 2013 11:45:18 +0000
Subject: New upstream version (3.10)


- Fixes format security bug (bz #1037055)

---

diff --git a/.gitignore b/.gitignore
index 476af40..e62d0eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ esorex-3.7.2.tar.gz
 /esorex-3.8.3.tar.gz
 /esorex-3.9.0.tar.gz
 /esorex-3.9.6.tar.gz
+/esorex-3.10.tar.gz
diff --git a/esorex-dso.patch b/esorex-dso.patch
deleted file mode 100644
index 26a2182..0000000
--- a/esorex-dso.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-@GETOPT@ $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
-esorex_DEP
diff --git a/esorex.spec b/esorex.spec
index 6bc0c0a..7da296e 100644
--- a/esorex.spec
+++ b/esorex.spec
@@ -1,6 +1,6 @@
 Name: esorex
-Version: 3.9.6
-Release: 2%{?dist}
+Version: 3.10
+Release: 1%{?dist}
 Summary: Recipe Execution Tool of the European Southern Observatory 
 
 Group: Applications/Engineering
@@ -8,8 +8,6 @@ License: GPLv2+
 URL: http://www.eso.org/observing/cpl/esorex.html
 Source0: ftp://ftp.eso.org/pub/dfs/pipelines/libraries/%{name}/%{name}-%{version}.tar.gz
 Patch0: esorex-configure.patch
-# Reported upstream 2010-02-22
-Patch1: esorex-dso.patch
 
 BuildRequires: cpl-devel
 BuildRequires: cfitsio-devel
@@ -32,17 +30,18 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-find -empty -type d| xargs rmdir
 make DESTDIR=%{buildroot} install
 
-
 %files
 %doc AUTHORS COPYING README BUGS ChangeLog
 %config(noreplace) %{_sysconfdir}/*
 %{_bindir}/*
-%{_datadir}/*
 
 %changelog
+* Thu Dec 05 2013 Sergio Pascual <sergiopr@fedoraproject.org> - 3.10-1
+- New upstream version (3.10)
+- Fixes format security bug (bz #1037055)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 8ab1235..85e986f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6e07dc6bfcb5b10c96f4eb5e9a535a5  esorex-3.9.6.tar.gz
+0b93fe258a2533c38e72c8d2904df6e0  esorex-3.10.tar.gz