rpms/hercules/devel hercules-3.06-ltdl.patch, 1.1, 1.2 hercules.spec, 1.26, 1.27

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6703

Modified Files:
	hercules-3.06-ltdl.patch hercules.spec 
Log Message:
* Thu Sep 17 2009 Dan Horák <dan[at]danny.cz> 3.06-5
- fixed module loading with libtool >= 2.0


hercules-3.06-ltdl.patch:
 b/Makefile.am |   11 
 b/hdl.h       |    4 
 ltdl.c        | 4501 ----------------------------------------------------------
 ltdl.h        |  367 ----
 4 files changed, 6 insertions(+), 4877 deletions(-)

Index: hercules-3.06-ltdl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules-3.06-ltdl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercules-3.06-ltdl.patch	18 Feb 2009 21:15:35 -0000	1.1
+++ hercules-3.06-ltdl.patch	17 Sep 2009 07:47:45 -0000	1.2
@@ -4944,3 +4944,31 @@ index ef0d161..0000000
 -- 
 1.6.0.6
 
+From 1c3de37f7a39676b028f3057131a5b9d7697b4fe Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Thu, 17 Sep 2009 08:35:39 +0200
+Subject: [PATCH] newer libtool (>=2.0) defines LT_MODULE_EXT in config.h instead of LDTL_SHLIB_EXT
+
+---
+ hdl.h |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/hdl.h b/hdl.h
+index 5dd2e54..b99f1e2 100644
+--- a/hdl.h
++++ b/hdl.h
+@@ -146,8 +146,11 @@ typedef struct _DLLENT {                /* DLL entry                 */
+ #endif
+ 
+ /* SHLIBEXT defined by ISW in configure.ac/config.h */
++/* newer libtool defines MODULE_EXT instead of SHLIB_EXT */
+ #if defined( HDL_BUILD_SHARED ) && defined( LTDL_SHLIB_EXT )
+   #define   HDL_MODULE_SUFFIX   LTDL_SHLIB_EXT
++#elif defined( HDL_BUILD_SHARED ) && defined( LT_MODULE_EXT )
++  #define   HDL_MODULE_SUFFIX   LT_MODULE_EXT
+ #else
+   #if defined(_MSVC_)
+     #define HDL_MODULE_SUFFIX   ".dll"
+-- 
+1.6.3.3
+


Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- hercules.spec	7 Sep 2009 10:02:56 -0000	1.26
+++ hercules.spec	17 Sep 2009 07:47:45 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.06
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
@@ -102,6 +102,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Thu Sep 17 2009 Dan Horák <dan[at]danny.cz> 3.06-5
+- fixed module loading with libtool >= 2.0
+
 * Mon Sep  7 2009 Dan Horák <dan[at]danny.cz> 3.06-4
 - enable support for external gui