rpms/hercules/devel hercules.spec,1.18,1.19

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/hercules/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24021

Modified Files:
	hercules.spec 
Log Message:
Fix loading of plugins (bz 430805, Hans de Goede).



Index: hercules.spec
===================================================================
RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hercules.spec	22 Aug 2007 16:52:56 -0000	1.18
+++ hercules.spec	3 Feb 2008 23:09:20 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.05
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.conmicro.cx/hercules/
@@ -27,16 +27,18 @@
 %setup -q
 %patch0 -p1 -b .open
 # Get the modules in the right place (lib64 on 64bit archs)
-%{__perl} -pi -e 's|\${DESTPREFIX}/lib/|${libdir}/|g' configure*
+sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
 # Scripts to be looked at, not executed from the docs
 %{__chmod} -x util/*
 
 %build
-# Required in 3.04 to find libs on x86_64
-export LDFLAGS="-L%{_libdir}"
 %configure \
     --enable-dependency-tracking \
     --enable-optimization="%{optflags}"
+# cleanup dlopen related mess configure makes, easier then patching up autohell
+sed -i -e 's|/\* #undef LTDL_SHLIB_EXT \*/|#define LTDL_SHLIB_EXT ".so"|' \
+  -e 's|"/lib:/usr/lib"|"/%{_lib}:/usr/%{_lib}"|g' config.h
+# <sigh> even more broken autohell, remove rpath setting
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
@@ -80,6 +82,9 @@
 
 
 %changelog
+* Sun Feb  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.05-4
+- Fix loading of plugins (bz 430805)
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 3.05-3
 - Rebuild for new BuildID feature.