From c60c2b4400ce2c02cc9f7ff95ad55945baa61026 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Apr 05 2020 21:54:01 +0000 Subject: sync with latest upstream release --- diff --git a/.gitignore b/.gitignore index b31c445..774eed4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ simh-3.8.1-noroms.tar.gz /simh-3.9.0-noroms.tar.gz +/simh-3.11.0-noroms.tar.gz diff --git a/simh-generate-tarball.sh b/simh-generate-tarball.sh index eb9d7cd..ab13403 100755 --- a/simh-generate-tarball.sh +++ b/simh-generate-tarball.sh @@ -2,8 +2,8 @@ VERSION=$1 MAJOR=${VERSION:0:1} -MINOR=${VERSION:2:1} -PATCH=${VERSION:4:1} +MINOR=${VERSION:2:2} +PATCH=${VERSION:5:1} unzip -o simhv$MAJOR$MINOR-$PATCH.zip -d simh-$VERSION rm simh-$VERSION/VAX/ka655* diff --git a/simh.spec b/simh.spec index e917228..485c9b0 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,7 @@ +%define _legacy_common_support 1 Name: simh -Version: 3.9.0 -Release: 13%{?dist} +Version: 3.11.0 +Release: 14%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -45,7 +46,7 @@ SIMH implements simulators for: * Scientific Data Systems SDS 940 %prep -%setup -qn %{name}-%{version} +%setup -qn %{name}-%{version}/sim %build @@ -65,14 +66,19 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %files %{_bindir}/* -%doc ALTAIR/altair.txt NOVA/eclipse.txt 0readme_39.txt 0readme_ethernet.txt -%doc HP2100/hp2100_diag.txt I7094/i7094_bug_history.txt Interdata/id_diag.txt +%doc ALTAIR/altair.txt NOVA/eclipse.txt 0readme_311.txt 0readme_ethernet.txt +%doc I7094/i7094_bug_history.txt Interdata/id_diag.txt %doc PDP1/pdp1_diag.txt PDP10/pdp10_bug_history.txt PDP18B/pdp18b_diag.txt %doc S3/haltguide.txt S3/readme_s3.txt S3/system3.txt SDS/sds_diag.txt %doc VAX/vax780_bug_history.txt %changelog +* Sun Apr 05 2020 Lucian Langa - 3.9.0-14 +- update generation script +- apply temporary gcc10 fix +- update to latest upstream + * Thu Jan 30 2020 Fedora Release Engineering - 3.9.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 69dd8fd..93591cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a17619b52f0883e575319bbae64a0209 simh-3.9.0-noroms.tar.gz +SHA512 (simh-3.11.0-noroms.tar.gz) = f4561701d67b774f56364ae7706a9a27a4030c52528db0198893b6ef8793124e3a9264b8d3b16a69d7084bd4e74c1cdaa897a8b2626ac679beadcaad217c0513