rpms/hercules/devel README-rpm, NONE, 1.1 hercules.spec, 1.14, 1.15 README.fedora, 1.2, NONE

Tue Jun 19 15:06:05 UTC 2007

Author: thias

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

Modified Files:
	hercules.spec 
Added Files:
	README-rpm 
Removed Files:
	README.fedora 
Log Message:
Update included README-rpm (#234803).

--- NEW FILE README-rpm ---
These are quick instructions on how to get Red Hat Enterprise Linux running
with Hercules.

Red Hat Enterprise Linux 4 and 5 steps :
======================================

Prepare hercules :
================
- Install : yum install hercules
- Edit /etc/hercules/hercules.cnf and change ARCHMODE if needed :
  - ESA/390 for s390
  - ESAME for s390x
- Create HD image : dasdinit -z /var/lib/hercules/linux.120 3390-3 lin000
- Mount the first installation CD
- Run : hercules-run
- Start installation : ipl /media/cdrom/generic.ins

Note that when running Hercules, all commands sent to the OS must be prefixed
by a dot. When not prefixed, commands are sent to Hercules itself (like "ipl").

OS installation example steps :
=============================
Which kind of network device do you intend to use:
.ctc
Enter the bus ID and the device number of your CCW devices:
.0.0.0600,0.0.0601
Enter the FQDN of your new Linux guest:
.s390.localdomain
Enter the IP address of your new Linux guest:
.192.168.200.3
Enter the network address of the new Linux guest:
.255.255.255.252
Enter the IP of your CTC / ESCON / IUCV point-to-point partner:
.192.168.200.4
Select which protocol should be used for the CTC interface:
.0
Enter your DNS server(s), separated by colons (:):
.192.168.1.1:192.168.1.2
Enter your DNS search domain(s) (if any), separated by colons (:):
.localdomain
Enter DASD range (e.g. 200-203   or  200,201,202,203):
.000-200

Use "telnet 192.168.200.3" and log in as "root" with no password (press enter).
The installation will start automatically.


Appendix :

Red Hat Linux 7.2 steps :
=======================

- Mount the installation CD and run "ipl /mnt/cdrom/redhat.ins"
  or
- Copy all files from the os/images/ directory to /etc/hercules/
- Replace in hercules.cnf the line :
000C  3505 kernel.img generic.prm initrd.img autopad
  with :
000C  3505 kernel.img redhat.prm initrd.img autopad
  And :
0580  3420 /etc/hercules/tape.tdf
  with :
0580  3420 /etc/hercules/redhat.tdf

- Commands :
ipl 000C
.s390.localdomain
.ctc0
.ctc0,0x600,0x601
.192.168.200.3
.192.168.200.4
.192.168.1.1
.localdomain
.120



Index: hercules.spec
===================================================================
RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hercules.spec	28 Aug 2006 10:03:06 -0000	1.14
+++ hercules.spec	19 Jun 2007 15:05:25 -0000	1.15
@@ -1,14 +1,14 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.04.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.conmicro.cx/hercules/
 Source0: http://www.conmicro.cx/hercules/hercules-%{version}.tar.gz
 Source1: hercules.cnf
 Source2: hercules-run
-Source3: README.fedora
+Source3: README-rpm
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, zlib-devel, bzip2-devel
 Obsoletes: hercules-docs <= 3.01
@@ -23,17 +23,20 @@
 
 
 %prep
-%setup
-
-%build
+%setup -q
 # Get the modules in the right place (lib64 on 64bit archs)
 %{__perl} -pi -e '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 \
-    --disable-rpath \
     --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}
 
 
@@ -49,7 +52,7 @@
 %{__install} -D -p -m 0755 %{SOURCE2} \
     %{buildroot}%{_sbindir}/hercules-run
 # Copy our README to be included as doc
-%{__install} -p -m 0644 %{SOURCE3} README.fedora
+%{__install} -p -m 0644 %{SOURCE3} README-rpm
 # Create empty directory where to store system images
 %{__mkdir_p} %{buildroot}%{_var}/lib/hercules
 
@@ -59,7 +62,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc CHANGES README* RELEASE* hercules.cnf html/ util/
 %dir %{_sysconfdir}/hercules/
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/hercules.cnf
@@ -75,6 +78,11 @@
 
 
 %changelog
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 3.04.1-5
+- Update included README-rpm (was README.fedora) to remove Fedora instructions
+  since after the Core+Extras merge, Fedora isn't built for x390 (#234803).
+- Remove rpath at last (using sed on the libtool script method).
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 3.04.1-4
 - FC6 rebuild.
 
@@ -87,7 +95,7 @@
 - Move out all the inlined configuration files, keep only the .cnf file.
 - Update .cnf file so that it works (load modules required for the default).
 - Include README.fedora to give quick instructions on how to get started.
-- Include empty %{_var}/lib/hercules/ directory.
+- Include empty %%{_var}/lib/hercules/ directory.
 - Rename hercules.init to hercules-run in PATH and clean it up somewhat.
 
 * Mon Jul  3 2006 Matthias Saou <http://freshrpms.net/> 3.04.1-1


--- README.fedora DELETED ---


