rpms/hercules/F-8 generic.prm, NONE, 1.1 hercules-3.05-make.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 hercules.spec, 1.18, 1.19 sources, 1.6, 1.7 hercules-3.05-open.patch, 1.1, NONE
Dan Horák
sharkcz at fedoraproject.org
Thu Oct 9 15:41:15 UTC 2008
Author: sharkcz
Update of /cvs/pkgs/rpms/hercules/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31064
Modified Files:
.cvsignore hercules.spec sources
Added Files:
generic.prm hercules-3.05-make.patch
Removed Files:
hercules-3.05-open.patch
Log Message:
* Thu Oct 09 2008 Dan Horak <dan[at]danny.cz> 3.05-7.20081009cvs
- update to CVS snapshot 20081009 (#461044)
- install utils only as docs
- little cleanup
--- NEW FILE generic.prm ---
root=/dev/ram0 ro ip=off ramdisk_size=40000
DASD=0120
NETTYPE=ctc
SUBCHANNELS=0.0.0600,0.0.0601
IPADDR=192.168.200.3
NETWORK=192.168.200.0
GATEWAY=192.168.200.4
#DNS=ip.of.dns.1:ip.of.dns.2
#SEARCHDNS=example.com:sample.com
#HOSTNAME=s390.localdomain
#vnc
hercules-3.05-make.patch:
--- NEW FILE hercules-3.05-make.patch ---
Index: Makefile.am
===================================================================
RCS file: /usr/cvs/hercules/hercules/Makefile.am,v
retrieving revision 1.183
diff -u -r1.183 Makefile.am
--- Makefile.am 22 May 2008 19:25:58 -0000 1.183
+++ Makefile.am 9 Oct 2008 13:27:50 -0000
@@ -65,7 +65,7 @@
lns=@LN_S@
-SUBDIRS = decNumber m4 po util html man . crypto
+SUBDIRS = decNumber m4 po html man . crypto
LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@
Index: configure.ac
===================================================================
RCS file: /usr/cvs/hercules/hercules/configure.ac,v
retrieving revision 1.197
diff -u -r1.197 configure.ac
--- configure.ac 25 Mar 2008 11:41:31 -0000 1.197
+++ configure.ac 9 Oct 2008 13:27:50 -0000
@@ -2077,7 +2077,7 @@
AC_CACHE_SAVE()
-AC_OUTPUT( [ Makefile util/Makefile html/Makefile crypto/Makefile po/Makefile.in po/Makefile man/Makefile m4/Makefile decNumber/Makefile] )
+AC_OUTPUT( [ Makefile html/Makefile crypto/Makefile po/Makefile.in po/Makefile man/Makefile m4/Makefile decNumber/Makefile] )
###############################################################################
# (end-of-file)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 Aug 2007 11:24:01 -0000 1.6
+++ .cvsignore 9 Oct 2008 15:40:45 -0000 1.7
@@ -1 +1 @@
-hercules-3.05.tar.gz
+hercules-3.05-20081009.tar.gz
Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/F-8/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 9 Oct 2008 15:40:45 -0000 1.19
@@ -1,17 +1,25 @@
+%define cvsdate 20081009
+
Summary: Hercules S/370, ESA/390, and z/Architecture emulator
Name: hercules
Version: 3.05
-Release: 3%{?dist}
+Release: 7.%{cvsdate}cvs%{?dist}
License: QPL
Group: Applications/Emulators
-URL: http://www.conmicro.cx/hercules/
-Source0: http://www.conmicro.cx/hercules/hercules-%{version}.tar.gz
+URL: http://www.hercules-390.org/
+#Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
+# CVS snapshot; use commands below to reproduce
+# cvs -d :pserver:anonymous at cvs.hercules-390.org:/usr/cvs/hercules co -D %{cvsdate} hercules
+# cd hercules; sh ./autogen.sh && ./configure && make dist
+Source0: hercules-%{version}-%{cvsdate}.tar.gz
Source1: hercules.cnf
Source2: hercules-run
Source3: README-rpm
-Patch0: hercules-3.05-open.patch
+Source4: generic.prm
+Patch0: %{name}-3.05-make.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: bison, zlib-devel, bzip2-devel
+BuildRequires: libtool
Obsoletes: hercules-docs <= 3.01
%description
@@ -25,20 +33,29 @@
%prep
%setup -q
-%patch0 -p1 -b .open
+%patch0 -p0
+
+# refresh for recent libtool
+rm autoconf/libtool.m4
+libtoolize --copy --force
+aclocal -I m4 -I autoconf
+autoheader
+automake
+autoconf
+
# 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/*
+# remove Makefile
+%{__rm} util/Makefile*
+
%build
-# Required in 3.04 to find libs on x86_64
-export LDFLAGS="-L%{_libdir}"
%configure \
--enable-dependency-tracking \
--enable-optimization="%{optflags}"
-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}
@@ -50,6 +67,8 @@
%{__mkdir_p} %{buildroot}%{_sysconfdir}/hercules
%{__cat} %{SOURCE1} | %{__sed} 's|@LIBDIR@|%{_libdir}|g' > \
%{buildroot}%{_sysconfdir}/hercules/hercules.cnf
+# Install generic.prm with parameters matching hercules.cnf
+%{__install} -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/hercules/
# Install our wrapper script (takes care of tunnel networking)
%{__install} -D -p -m 0755 %{SOURCE2} \
%{buildroot}%{_sbindir}/hercules-run
@@ -68,6 +87,7 @@
%doc CHANGES README* RELEASE* hercules.cnf html/ util/
%dir %{_sysconfdir}/hercules/
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/hercules.cnf
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/generic.prm
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/hercules/
@@ -80,6 +100,18 @@
%changelog
+* Thu Oct 09 2008 Dan Horak <dan[at]danny.cz> 3.05-7.20081009cvs
+- update to CVS snapshot 20081009 (#461044)
+- install utils only as docs
+- little cleanup
+
+* Thu Apr 10 2008 Jarod Wilson <jwilson at redhat.com> 3.05-5
+- Point to new project URL
+- Add a template generic.prm matching provided hercules.cnf
+
+* 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.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 5 Aug 2007 11:24:01 -0000 1.6
+++ sources 9 Oct 2008 15:40:45 -0000 1.7
@@ -1 +1 @@
-da8d85ac18c140b460574a0454abb936 hercules-3.05.tar.gz
+9c3719547c6e40160ff4cfb9a664fd05 hercules-3.05-20081009.tar.gz
--- hercules-3.05-open.patch DELETED ---
More information about the scm-commits
mailing list