rpms/hercules/devel hercules-force-hfp-unnormalized.patch, NONE, 1.1 hercules-intltoolize.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 hercules.cnf, 1.2, 1.3 hercules.spec, 1.28, 1.29 sources, 1.8, 1.9 hercules-3.06-extgui.patch, 1.1, NONE hercules-3.06-preproc.patch, 1.1, NONE
Dan Horák
sharkcz at fedoraproject.org
Tue Dec 15 10:56:49 UTC 2009
Author: sharkcz
Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19200
Modified Files:
.cvsignore hercules.cnf hercules.spec sources
Added Files:
hercules-force-hfp-unnormalized.patch
hercules-intltoolize.patch
Removed Files:
hercules-3.06-extgui.patch hercules-3.06-preproc.patch
Log Message:
* Mon Dec 14 2009 Dan Horák <dan[at]danny.cz> 3.06-7.20091214svn5544
- updated to svn revision 5544
- added workaround for booting Fedora kernels requiring z9 or better
- spec cleanup
- updated default config
hercules-force-hfp-unnormalized.patch:
esame.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE hercules-force-hfp-unnormalized.patch ---
>From 71661b7ec83f4a4cebb77d7eadfaf2729b0a0196 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 13 Dec 2009 16:58:20 +0100
Subject: [PATCH] forcefully enable the HFP_UNNORMALIZED extension
---
esame.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/esame.c b/esame.c
index b1803e0..472e0b0 100644
--- a/esame.c
+++ b/esame.c
@@ -5202,6 +5202,9 @@ BYTE *stfl_data; /* -> STFL data being modified. Depends upon */
stfl_data[0] |= STFL_0_ESAME_INSTALLED;
+ // forcefully report this extension
+ stfl_data[2] |= STFL_2_HFP_UNNORM_EXT;
+
/* Set whether z/Arch is active based upon CPU mode */
if (regs->arch_mode == ARCH_900)
stfl_data[0] |= STFL_0_ESAME_ACTIVE;
--
1.6.3.3
hercules-intltoolize.patch:
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE hercules-intltoolize.patch ---
>From 6c072a76206f35323788f4a70b9d8e8570dc25c6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 14 Dec 2009 17:07:37 +0100
Subject: [PATCH] add support for intltoolize
---
configure.ac | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0eee5c9..85a2886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,9 @@ AC_MSG_NOTICE( [(use of lt_dlopen forced by Hercules Dynamic Loader requirement)
hc_cv_have_lt_dlopen=yes
+IT_PROG_INTLTOOL
+GETTEXT_PACKAGE=hercules
+AC_SUBST(GETTEXT_PACKAGE)
AM_GNU_GETTEXT([external]) #
AM_ICONV
--
1.6.3.3
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 18 Feb 2009 21:15:35 -0000 1.8
+++ .cvsignore 15 Dec 2009 10:56:46 -0000 1.9
@@ -1 +1 @@
-hercules-3.06.tar.gz
+hercules-svn5544.tar.bz2
Index: hercules.cnf
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.cnf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hercules.cnf 1 Aug 2006 12:21:25 -0000 1.2
+++ hercules.cnf 15 Dec 2009 10:56:48 -0000 1.3
@@ -2,17 +2,15 @@
# the Hercules ESA/390 emulator
CPUSERIAL 002623 # CPU serial number
-CPUMODEL 3090 # CPU model number: 3090, 7490, 2064
-MAINSIZE 256 # Main storage size in megabytes
+CPUMODEL 2064 # CPU model number: 3090, 7490, 2064
+MAINSIZE 512 # Main storage size in megabytes
NUMCPU 1 # Number of CPUs
CNSLPORT 3270 # TCP port number to which consoles connect
#HTTPPORT 8081 # enable a HTTP server on this port
OSTAILOR LINUX # OS tailoring
LOADPARM 0120.... # IPL parameter
-IODELAY 0 # modern kernels do not need a delay
-ARCHMODE ESA/390 # Architecture mode S/370, ESA/390 or ESAME
+ARCHMODE ESAME # Architecture mode S/370, ESA/390 or ESAME
TZOFFSET +0100 # Central Europe
-MODPATH @LIBDIR@/hercules
LDMOD hdt3088.so hdt3420.so hdt3505.so
# .----------------- Device number
@@ -36,7 +34,7 @@ LDMOD hdt3088.so hdt3420.so hdt3505.
#0200 3270
#0201 3270
# tape drives
-0580 3420 /etc/hercules/tape.tdf
+#0580 3420 /etc/hercules/tape.tdf
#0581 3420 /dev/st0
#0582 3420 ickdsf.ipl
# networking, channel-to-channel adapter
@@ -44,4 +42,3 @@ LDMOD hdt3088.so hdt3420.so hdt3505.
0601 3088 CTCI -n /dev/net/tun -t 1500 192.168.200.3 192.168.200.4
# networking, LCS adaptor
#0700 3088 LCS 192.168.200.4 -n /dev/net/tun -m 01:02:03:04:05:06
-
Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- hercules.spec 26 Sep 2009 08:15:43 -0000 1.28
+++ hercules.spec 15 Dec 2009 10:56:48 -0000 1.29
@@ -1,25 +1,29 @@
+%global svnrev 5544
+
Summary: Hercules S/370, ESA/390, and z/Architecture emulator
Name: hercules
Version: 3.06
-Release: 6%{?dist}
+Release: 7.20091214svn5544%{?dist}
License: QPL
Group: Applications/Emulators
URL: http://www.hercules-390.org/
-Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
+#Source0: http://www.hercules-390.org/%{name}-%{version}.tar.gz
+Source0: %{name}-svn%{svnrev}.tar.bz2
Source1: hercules.cnf
Source2: hercules-run
Source3: README-rpm
Source4: generic.prm
Patch0: %{name}-3.05-make.patch
Patch1: %{name}-3.06-ltdl.patch
-Patch2: %{name}-3.06-preproc.patch
-Patch3: %{name}-3.06-extgui.patch
+Patch2: %{name}-force-hfp-unnormalized.patch
+Patch3: %{name}-intltoolize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: libcap-devel
BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
+BuildRequires: intltool
%description
Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture
@@ -31,17 +35,18 @@ printer-keyboard, 3270 terminal, and 328
%prep
-%setup -q
+%setup -q -n %{name}
%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p1
# refresh for recent libtool
-rm autoconf/libtool.m4
+rm -f autoconf/libtool.m4
libtoolize --copy --force
# refresh buildsystem
+intltoolize -f
aclocal -I m4 -I autoconf
autoheader
automake
@@ -50,9 +55,9 @@ autoconf
# Get the modules in the right place (lib64 on 64bit archs)
sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
# Scripts to be looked at, not executed from the docs
-%{__chmod} -x util/*
+chmod -x util/*
# remove Makefile
-%{__rm} util/Makefile*
+rm util/Makefile*
%build
@@ -61,30 +66,32 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
--enable-dependency-tracking \
--enable-optimization="%{optflags}"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
%install
-%{__rm} -rf %{buildroot} README.fedora
-%{__make} install DESTDIR=%{buildroot}
+rm -rf %{buildroot} README.fedora
+make install DESTDIR=%{buildroot}
+
%find_lang %{name}
-# Install our configuration file, substitute @LIBDIR@ for the current value
-%{__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/
+
+mkdir -p %{buildroot}%{_sysconfdir}/hercules
+# Install config files
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/hercules/
+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
+install -D -p -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}/hercules-run
+
# Copy our README to be included as doc
-%{__install} -p -m 0644 %{SOURCE3} README-rpm
+install -p -m 0644 %{SOURCE3} README-rpm
+
# Create empty directory where to store system images
-%{__mkdir_p} %{buildroot}%{_var}/lib/hercules
+mkdir -p %{buildroot}%{_sharedstatedir}/hercules
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%files -f %{name}.lang
@@ -101,10 +108,16 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
%{_libdir}/*.so
%exclude %{_libdir}/*.la
%{_mandir}/man?/*
-%dir %{_var}/lib/hercules/
+%dir %{_sharedstatedir}/hercules/
%changelog
+* Mon Dec 14 2009 Dan Horák <dan[at]danny.cz> 3.06-7.20091214svn5544
+- updated to svn revision 5544
+- added workaround for booting Fedora kernels requiring z9 or better
+- spec cleanup
+- updated default config
+
* Sat Sep 26 2009 Dan Horák <dan[at]danny.cz> 3.06-6
- rebuilt to use POSIX capabilities
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 18 Feb 2009 21:15:35 -0000 1.8
+++ sources 15 Dec 2009 10:56:49 -0000 1.9
@@ -1 +1 @@
-3a356b251e2b7fc49ac2b7244d12d50b hercules-3.06.tar.gz
+4a2ca4b822fadf26287681dadca7d8c8 hercules-svn5544.tar.bz2
--- hercules-3.06-extgui.patch DELETED ---
--- hercules-3.06-preproc.patch DELETED ---
More information about the fedora-extras-commits
mailing list