rpms/hercules/devel .cvsignore, 1.4, 1.5 hercules.spec, 1.10, 1.11 sources, 1.4, 1.5

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	.cvsignore hercules.spec sources 
Log Message:
Update to 3.04.1 and fix x86_64 build (#185906).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hercules/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Mar 2006 15:05:31 -0000	1.4
+++ .cvsignore	3 Jul 2006 10:33:50 -0000	1.5
@@ -1 +1 @@
-hercules-3.04.tar.gz
+hercules-3.04.1.tar.gz


Index: hercules.spec
===================================================================
RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hercules.spec	15 Mar 2006 14:51:42 -0000	1.10
+++ hercules.spec	3 Jul 2006 10:33:50 -0000	1.11
@@ -2,16 +2,14 @@
 
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
-Version: 3.04
+Version: 3.04.1
 Release: 1%{?date:.%{date}}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.conmicro.cx/hercules/
 Source: http://www.conmicro.cx/hercules/hercules-%{version}%{?date:-cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, zlib-devel, bzip2-devel, libgcrypt-devel, gcc-c++
-BuildRequires: gettext-devel
-BuildRequires: autoconf, automake, libtool
+BuildRequires: bison, zlib-devel, bzip2-devel
 Obsoletes: hercules-docs <= 3.01
 
 %description
@@ -25,13 +23,6 @@
 
 %prep
 %setup -n %{name}-%{version}%{?date:-cvs}
-#autoreconf -Iautoconf -Im4 -f -i
-aclocal
-automake -c -f
-
-### FIXME: Make buildsystem use standard autotools directories (Fix upstream please)
-%{__perl} -pi.orig -e 's|^(modexecdir) =.*$|$1 = \$(libdir)/hercules|' \
-    Makefile.in crypto/Makefile.in
 
 %{__mv} hercules.cnf hercules.cnf.sample
 %{__cat} <<EOF >hercules.cnf
@@ -150,19 +141,24 @@
 
 
 %build
+# Get the modules in the right place
+%{__perl} -pi -e 's|(\${DESTPREFIX})/lib/|$1/%{_lib}/|g' configure*
+# Required in 3.04 to find libs on x86_64
+export LDFLAGS="-L%{_libdir}"
 %configure \
     --enable-dependency-tracking \
+    --disable-rpath \
     --enable-optimization="%{optflags}"
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 %find_lang %{name}
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/hercules/
-%{__install} -m0755 hercules.init %{buildroot}%{_sysconfdir}/hercules/
-%{__install} -m0644 hercules.cnf hercules.{ins,prm,tdf} \
+%{__install} -p -m 0755 hercules.init %{buildroot}%{_sysconfdir}/hercules/
+%{__install} -p -m 0644 hercules.cnf hercules.{ins,prm,tdf} \
     %{buildroot}%{_sysconfdir}/hercules/
 
 
@@ -184,6 +180,13 @@
 
 
 %changelog
+* Mon Jul  3 2006 Matthias Saou <http://freshrpms.net/> 3.04.1-1
+- Update to 3.04.1 (useless, I know).
+- Remove no longer needed libgcrypt dependency.
+- Add explicit LDFLAGS to fix x86_64 compilation at last! (#185906)
+- Pass --disable-rpath to configure.
+- Update lib vs. lib64 hack since it's only needed in configure now.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 3.04-1
 - Update to 3.04.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hercules/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Mar 2006 15:05:31 -0000	1.4
+++ sources	3 Jul 2006 10:33:50 -0000	1.5
@@ -1 +1 @@
-7c7df7d52bf0365d5cbe051dc9e2e481  hercules-3.04.tar.gz
+7ca609490a5d135c91c3f69986e0a162  hercules-3.04.1.tar.gz