Hello community, here is the log from the commit of package simh for openSUSE:Factory checked in at 2020-06-07 21:39:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/simh (Old) and /work/SRC/openSUSE:Factory/.simh.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "simh" Sun Jun 7 21:39:06 2020 rev:21 rq:812227 version:3.11_0 Changes: -------- --- /work/SRC/openSUSE:Factory/simh/simh.changes 2013-04-29 14:18:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.simh.new.3606/simh.changes 2020-06-07 21:39:11.445616033 +0200 @@ -1,0 +2,21 @@ +Sun Jun 7 09:49:22 UTC 2020 - Klaus Kämpf <[email protected]> + +- Update to 3.11 + V3.11 incorporates SCP additions and extensions by Dave Bryan to + support his HP simulators. + * added simh-sigma and simh-uc15 + +- dropped Unix v7 image, get it from http://simh.trailing-edge.com/software.html + +- add 0001-declare-don-t-define-uc15_memsize-in-include-file.patch + +- dropped interim-20130422.tar.gz and interim-20130422.patch + (removed simh-altairz80, simh-hp2100, simh-swtp6800mp-a, simh-swtp6800mp-a2) + +- dropped (unused) simhv37-3.dif + +- Update to 3.10 + V3.10 backports an significant number of modules and features from + the SimH 4.x branch, as well as some unique new features. + +------------------------------------------------------------------- Old: ---- interim-20130422.patch interim-20130422.tar.gz simhv37-3.dif simhv39-0.zip uv7swre.tar.bz2 New: ---- 0001-declare-don-t-define-uc15_memsize-in-include-file.patch simhv311-0.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simh.spec ++++++ --- /var/tmp/diff_new_pack.8Zpc6s/_old 2020-06-07 21:39:13.237621713 +0200 +++ /var/tmp/diff_new_pack.8Zpc6s/_new 2020-06-07 21:39:13.237621713 +0200 @@ -1,7 +1,7 @@ # # spec file for package simh # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,31 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: simh BuildRequires: libpcap-devel BuildRequires: unzip -Url: http://simh.trailing-edge.com/ -Version: 3.9_0 +URL: http://simh.trailing-edge.com/ +Version: 3.11_0 Release: 0 Summary: A collection of simulators of historically significant data processing systems License: BSD-3-Clause Group: System/Emulators/Other -Source: http://simh.trailing-edge.com/sources/simhv39-0.zip -Source1: uv7swre.tar.bz2 -# 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 +Source: http://simh.trailing-edge.com/sources/simhv311-0.zip +Patch1: 0001-declare-don-t-define-uc15_memsize-in-include-file.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: help2man @@ -69,24 +59,13 @@ %prep -%setup -c -T -a 1 +%setup -c -T unzip -a %SOURCE0 -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 +cd sim +%patch1 -p1 %build +cd sim mkdir -p BIN USE_NETWORK=1 make for i in $(cd BIN; ls *) ; do @@ -98,25 +77,22 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/bin -install -m 755 BIN/* $RPM_BUILD_ROOT/usr/bin -chmod 644 *.txt SDS/*.txt Interdata/*.txt +install -m 755 sim/BIN/* $RPM_BUILD_ROOT/usr/bin +chmod 644 sim/*.txt sim/SDS/*.txt sim/Interdata/*.txt %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc *.txt Disks */*txt +%doc sim/*.txt sim/*/*txt %{_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 @@ -131,10 +107,9 @@ %{_bindir}/simh-pdp9 %{_bindir}/simh-s3 %{_bindir}/simh-sds +%{_bindir}/simh-sigma +%{_bindir}/simh-uc15 %{_bindir}/simh-vax %{_bindir}/simh-vax780 -%{_bindir}/simh-eclipse -%{_bindir}/simh-swtp6800mp-a -%{_bindir}/simh-swtp6800mp-a2 %changelog ++++++ 0001-declare-don-t-define-uc15_memsize-in-include-file.patch ++++++ >From 0c160249655cf6cff4fa42f17b642dee1a5048ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Sun, 7 Jun 2020 12:54:05 +0200 Subject: [PATCH] declare, don't define uc15_memsize in include file --- PDP11/pdp11_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PDP11/pdp11_defs.h b/PDP11/pdp11_defs.h index 8973708..1924177 100644 --- a/PDP11/pdp11_defs.h +++ b/PDP11/pdp11_defs.h @@ -900,7 +900,7 @@ void cpu_set_boot (int32 pc); #define WrMemW(pa,d) uc15_WrMemW (pa, d) #define WrMemB(pa, d) uc15_WrMemB (pa, d) -uint32 uc15_memsize; +extern uint32 uc15_memsize; int32 uc15_RdMemW (int32 pa); int32 uc15_RdMemB (int32 pa); void uc15_WrMemW (int32 pa, int32 d); -- 2.26.2
