Hello community, here is the log from the commit of package simh for openSUSE:Factory checked in at 2013-04-29 14:18:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/simh (Old) and /work/SRC/openSUSE:Factory/.simh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "simh", Maintainer is "kkaempf@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/simh/simh.changes 2011-09-23 12:46:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.simh.new/simh.changes 2013-04-29 14:18:24.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Apr 22 12:50:25 UTC 2013 - boris@steki.net + +- Updated to latest upstream 39_0 version + a lot of changes please look at CHANGELOG_simh_rev_h.txt in + /usr/share/doc/packages/simh +- Interim source fixes attached ( interim-20130422.patch ) +- Use source url for zip + +------------------------------------------------------------------- +Mon Apr 22 07:49:30 UTC 2013 - speilicke@suse.com + +- Rename binary "nova" to "simh.nova" to avoid file conflict with + python-novaclient (from OpenStack) + +------------------------------------------------------------------- Old: ---- simhv37-3.zip New: ---- interim-20130422.patch interim-20130422.tar.gz simhv39-0.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simh.spec ++++++ --- /var/tmp/diff_new_pack.huoFE4/_old 2013-04-29 14:18:27.000000000 +0200 +++ /var/tmp/diff_new_pack.huoFE4/_new 2013-04-29 14:18:27.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package simh (Version 3.7_3) +# spec file for package simh # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,56 +15,49 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: simh -BuildRequires: libpcap-devel unzip +BuildRequires: libpcap-devel +BuildRequires: unzip Url: http://simh.trailing-edge.com/ +Version: 3.9_0 +Release: 0 +Summary: A collection of simulators of historically significant data processing systems License: BSD-3-Clause Group: System/Emulators/Other -AutoReqProv: on -Version: 3.7_3 -Release: 35 -Summary: A collection of simulators of historically significant data processing systems -Source: simhv37-3.zip +Source: http://simh.trailing-edge.com/sources/simhv39-0.zip Source1: uv7swre.tar.bz2 -Patch: simhv37-3.dif +# Preparation of interim patches... +# DFORMAT=$(date +"%Y%m%d") +# export DFORMAT +# wget -q -nH -m -np http://simh.trailing-edge.com/interim/ && mv interim/ interim-${DFORMAT} && mv interim-${DFORMAT} && rm interim-${DFORMAT}/index* +# tar zvcf interim-${DFORMAT}.tar.gz interim-${DFORMAT} +Source2: interim-20130422.tar.gz +# PATCH-FIX-UPSTREAM -- obsolete not used any more... +Patch0: simhv37-3.dif +# PATCH-FIX-UPSTREAM interim-20130422.patch fix for interim source as it has typo error +Patch1: interim-20130422.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: help2man + %description This package contains simulators of the following systems: - Data General Nova - Data General Eclipse - Digital Equipment Corporation PDP-1 - Digital Equipment Corporation PDP-4 - Digital Equipment Corporation PDP-7 - Digital Equipment Corporation PDP-8 - Digital Equipment Corporation PDP-9 - Digital Equipment Corporation PDP-10 - Digital Equipment Corporation PDP-11 - Digital Equipment Corporation PDP-15 - Digital Equipment Corporation PDP-18B - IBM 1401 - IBM System 3 - Hewlett-Packard HP 2100 - Honeywell H316 - MITS Altair 8800 A disk image with UNIX V7 for the PDP-11 is included, instructions on @@ -75,25 +68,32 @@ History Simulation Project at http://simh.trailing-edge.com/ - -Authors: --------- - Bob Supnik - Charles Owen - Peter Schorn - %prep %setup -c -T -a 1 unzip -a %SOURCE0 -%patch +tar zxvf %SOURCE2 +# obsolete patch +#%%patch +%patch1 #for i in `find -name "*.[ch]"` makefile #do # recode ibmpc..lat1 $i || true #done +# replace files with interim fixed ones... +for i in interim-20130422/* ; do + FLOCATION=$(find . -name $(basename $i)|grep -v interim) + cp -v $i $FLOCATION +done + %build mkdir -p BIN USE_NETWORK=1 make +for i in $(cd BIN; ls *) ; do + mv -v BIN/${i} BIN/simh-${i} +done + +cp sim_rev.h CHANGELOG_sim_rev_h.txt %install rm -rf $RPM_BUILD_ROOT @@ -107,31 +107,34 @@ %files %defattr(-,root,root) %doc *.txt Disks */*txt -/usr/bin/altair -/usr/bin/altairz80 -/usr/bin/simh-eclipse -/usr/bin/gri -/usr/bin/h316 -/usr/bin/hp2100 -/usr/bin/i1401 -/usr/bin/i1620 -/usr/bin/i7094 -/usr/bin/ibm1130 -/usr/bin/id16 -/usr/bin/id32 -/usr/bin/lgp -/usr/bin/nova -/usr/bin/pdp1 -/usr/bin/pdp10 -/usr/bin/pdp11 -/usr/bin/pdp15 -/usr/bin/pdp4 -/usr/bin/pdp7 -/usr/bin/pdp8 -/usr/bin/pdp9 -/usr/bin/s3 -/usr/bin/sds -/usr/bin/vax -/usr/bin/vax780 +%{_bindir}/simh-altair +%{_bindir}/simh-altairz80 +%{_bindir}/simh-eclipse +%{_bindir}/simh-gri +%{_bindir}/simh-h316 +%{_bindir}/simh-hp2100 +%{_bindir}/simh-i1401 +%{_bindir}/simh-i1620 +%{_bindir}/simh-i7094 +%{_bindir}/simh-ibm1130 +%{_bindir}/simh-id16 +%{_bindir}/simh-id32 +%{_bindir}/simh-lgp +%{_bindir}/simh-nova +%{_bindir}/simh-pdp1 +%{_bindir}/simh-pdp10 +%{_bindir}/simh-pdp11 +%{_bindir}/simh-pdp15 +%{_bindir}/simh-pdp4 +%{_bindir}/simh-pdp7 +%{_bindir}/simh-pdp8 +%{_bindir}/simh-pdp9 +%{_bindir}/simh-s3 +%{_bindir}/simh-sds +%{_bindir}/simh-vax +%{_bindir}/simh-vax780 +%{_bindir}/simh-eclipse +%{_bindir}/simh-swtp6800mp-a +%{_bindir}/simh-swtp6800mp-a2 %changelog ++++++ interim-20130422.patch ++++++ --- interim-20130422/pdp10_rp.c~ 2012-12-09 15:44:25.000000000 +0100 +++ interim-20130422/pdp10_rp.c 2013-04-22 15:12:59.688307792 +0200 @@ -808,7 +808,7 @@ return; case FNC_UNLOAD: /* unload */ - if (drv_tab[dtype].ctrl == RM_CTRL) { /* RM? */ + if (drv_tab[dtype].ctrl == MBA_RM_CTRL) { /* RM? */ rp_set_er (ER1_ILF, drv); /* not supported */ break; } --- interim-20130422/pdp10_rp.c~ 2013-04-22 15:12:59.000000000 +0200 +++ interim-20130422/pdp10_rp.c 2013-04-22 15:28:15.262059900 +0200 @@ -809,7 +809,7 @@ case FNC_UNLOAD: /* unload */ if (drv_tab[dtype].ctrl == MBA_RM_CTRL) { /* RM? */ - rp_set_er (ER1_ILF, drv); /* not supported */ + set_rper (ER1_ILF, drv); /* not supported */ break; } rp_detach (uptr); /* detach unit */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org