[hercules] - updated to 3.10 (#1060467)

[Dan Horák]

commit fdb69f99a2ba1f5ee98b3d339753f10de3b0a6ea
Author: Dan Horák <dan at danny.cz>
Date:   Sun Feb 2 18:34:42 2014 +0100

    - updated to 3.10 (#1060467)

 hercules-3.08.1-util.patch                         |   24 --------
 hercules-3.09-format.patch                         |   25 ---------
 ...3.09-fedora.patch => hercules-3.10-fedora.patch |   56 +++++++++++++++++---
 hercules.spec                                      |   14 ++---
 4 files changed, 54 insertions(+), 65 deletions(-)
---
diff --git a/hercules-3.09-fedora.patch b/hercules-3.10-fedora.patch
similarity index 86%
rename from hercules-3.09-fedora.patch
rename to hercules-3.10-fedora.patch
index be79956..18a4875 100644
--- a/hercules-3.09-fedora.patch
+++ b/hercules-3.10-fedora.patch
@@ -1,7 +1,7 @@
-From 998d39a534798a52f44d797f67ad8baabbbef28b Mon Sep 17 00:00:00 2001
+From eb974575227fe2792293d2024127715876753056 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
 Date: Tue, 28 May 2013 21:57:36 +0200
-Subject: [PATCH] use system ltdl library
+Subject: [PATCH 1/2] use system ltdl library
 
 ---
  Makefile.am           |  11 ++--
@@ -13,17 +13,17 @@ Subject: [PATCH] use system ltdl library
  6 files changed, 8 insertions(+), 158 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index c1356a7..33e9569 100644
+index f5ef0f4..917783b 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -10,7 +10,7 @@ lns=@LN_S@
  
- SUBDIRS = decNumber m4 util html man . crypto
+ SUBDIRS = decNumber softfloat m4 util html man . crypto
  
 -LDADD = @LIBS@
 +LDADD = @LIBS@ -lltdl
  
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber -I$(top_srcdir)/softfloat
  
 @@ -98,7 +98,6 @@ endif
  
@@ -61,7 +61,7 @@ index c1356a7..33e9569 100644
  
    libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
  
-@@ -658,7 +654,6 @@ noinst_HEADERS = hostinfo.h     \
+@@ -656,7 +652,6 @@ noinst_HEADERS = hostinfo.h     \
                   hdl.h          \
                   crypto.h       \
                   sockdev.h      \
@@ -83,7 +83,7 @@ index 476fb07..edbc68c 100644
  
  #if !defined( _MSVC_ )
 diff --git a/configure.ac b/configure.ac
-index ab6e7bb..bf463fc 100644
+index 80a38e1..3cb8ef7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -44,151 +44,8 @@ modexecdir='$(libdir)/$(PACKAGE)'
@@ -285,5 +285,45 @@ index a4b0494..1f935aa 100644
  
  
 -- 
-1.8.1.4
+1.8.5.3
+
+
+From 02bf55850a2889f46debbfc75ef6734ae0e0fe36 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Sun, 2 Feb 2014 18:21:46 +0100
+Subject: [PATCH 2/2] don't run Makefile in the util directory
+
+---
+ Makefile.am  | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 917783b..65062a5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS  = -I m4 -I autoconf
+ 
+ lns=@LN_S@
+ 
+-SUBDIRS = decNumber softfloat m4 util html man . crypto
++SUBDIRS = decNumber softfloat m4 html man . crypto
+ 
+ LDADD = @LIBS@ -lltdl
+ 
+diff --git a/configure.ac b/configure.ac
+index 3cb8ef7..61f6537 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1785,7 +1785,7 @@ AM_CONDITIONAL( USE_DLLTOOL,         [ test "$hc_cv_is_windows"       = "yes" ]
+ 
+ AC_CACHE_SAVE()
+ 
+-AC_OUTPUT( [ Makefile util/Makefile html/Makefile crypto/Makefile man/Makefile m4/Makefile decNumber/Makefile softfloat/Makefile] )
++AC_OUTPUT( [ Makefile html/Makefile crypto/Makefile man/Makefile m4/Makefile decNumber/Makefile softfloat/Makefile] )
+ 
+ ###############################################################################
+ #   (end-of-file)
+-- 
+1.8.5.3
 
diff --git a/hercules.spec b/hercules.spec
index 4a41db8..90b46fb 100644
--- a/hercules.spec
+++ b/hercules.spec
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
-Version: 3.09
-Release: 2%{?dist}
+Version: 3.10
+Release: 1%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.eu/
@@ -11,10 +11,7 @@ Source1: hercules.cnf
 Source2: hercules-run
 Source3: README-rpm
 Source4: generic.prm
-Patch0: %{name}-3.09-fedora.patch
-Patch1: %{name}-3.08.1-util.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1037121
-Patch2: %{name}-3.09-format.patch
+Patch0: %{name}-3.10-fedora.patch
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
 BuildRequires: libcap-devel
@@ -36,8 +33,6 @@ printer-keyboard, 3270 terminal, and 3287 printer devices.
 %setup -q
 
 %patch0 -p1 -b .fedora
-%patch1 -p1 -b .util
-%patch2 -p1 -b .format
 
 rm autoconf/libtool.m4
 autoreconf -f -i
@@ -102,6 +97,9 @@ rm %{buildroot}%{_libdir}/*.la
 
 
 %changelog
+* Sat Feb 01 2014 Dan Horák <dan[at]danny.cz> - 3.10-1
+- updated to 3.10 (#1060467)
+
 * Tue Dec 03 2013 Dan Horák <dan[at]danny.cz> - 3.09-2
 - fix build with -Werror=format-security (#1037121)