From 200e04b3a00701fe2772bd3db6ca00d3fc4f51c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:29:52 +0000 Subject: [PATCH 01/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 45ccf8a..1f1a0f4 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,6 @@ Name: simh Version: 3.9.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A highly portable, multi-system emulator Group: Applications/Emulators @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.9.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 3.9.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3d42fb53b55cb205cfa5c2c02ceba48c30216763 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:40:16 +0000 Subject: [PATCH 02/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 1f1a0f4..2575591 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,6 @@ Name: simh Version: 3.9.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A highly portable, multi-system emulator Group: Applications/Emulators @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 3.9.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c88715f8c8ce7c76f972d631d132afd379c02094 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:28:46 +0000 Subject: [PATCH 03/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 2575591..b536adf 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,6 @@ Name: simh Version: 3.9.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A highly portable, multi-system emulator Group: Applications/Emulators @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.9.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.9.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 2d82191a63f875f53e3d9714992eac624bada3c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:49:32 +0000 Subject: [PATCH 04/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index b536adf..a50f33c 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,6 @@ Name: simh Version: 3.9.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A highly portable, multi-system emulator Group: Applications/Emulators @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 3.9.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From ac3dc9a55e6a3eb8af9d5bed0be2fbd71d020783 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:37:36 +0100 Subject: [PATCH 05/37] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- simh.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/simh.spec b/simh.spec index a50f33c..b1bd658 100644 --- a/simh.spec +++ b/simh.spec @@ -18,7 +18,6 @@ Source0: simh-%{version}-noroms.tar.gz # ./simh-generate-tarball.sh 3.8.1 Source1: simh-generate-tarball.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap-devel, dos2unix #Requires: From 8642b828b7ed9e43a38c1d103e153215a1c91b61 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:50:04 +0100 Subject: [PATCH 06/37] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- simh.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/simh.spec b/simh.spec index b1bd658..eea31b8 100644 --- a/simh.spec +++ b/simh.spec @@ -62,9 +62,6 @@ done mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} for i in `find -iname "*.txt"`; do dos2unix -k $i; done -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) From 2ed7627308bab4b96679e34301827598e9f8d167 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:21:46 -0500 Subject: [PATCH 07/37] Remove needless use of %defattr --- simh.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/simh.spec b/simh.spec index eea31b8..40bc4e3 100644 --- a/simh.spec +++ b/simh.spec @@ -64,7 +64,6 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %files -%defattr(-,root,root,-) %{_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 From 12698ee1ec886bf61de31d453d5a9394f9678c5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:10:59 +0000 Subject: [PATCH 08/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 40bc4e3..8586617 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,6 @@ Name: simh Version: 3.9.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A highly portable, multi-system emulator Group: Applications/Emulators @@ -73,6 +73,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.9.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 3.9.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From edde674ef24584477d03fc2de4448b62b3ad128e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 18 Jul 2018 11:23:40 +0200 Subject: [PATCH 09/37] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- simh.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/simh.spec b/simh.spec index 8586617..bcc2c99 100644 --- a/simh.spec +++ b/simh.spec @@ -19,6 +19,7 @@ Source0: simh-%{version}-noroms.tar.gz Source1: simh-generate-tarball.sh +BuildRequires: gcc BuildRequires: libpcap-devel, dos2unix #Requires: From e4afed09e6b9c25914746d6e98d7ccd4681a43ec Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:25 +0100 Subject: [PATCH 10/37] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- simh.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/simh.spec b/simh.spec index bcc2c99..d7ecf66 100644 --- a/simh.spec +++ b/simh.spec @@ -3,7 +3,6 @@ Version: 3.9.0 Release: 10%{?dist} Summary: A highly portable, multi-system emulator -Group: Applications/Emulators #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code #in there, notably in AltairZ80/. #(each target is compiled into its own binary, so only AltairZ80 is GPL+) From f454c45dd1eb0fc608095227cddc74b095fa019e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:29:19 +0000 Subject: [PATCH 11/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index d7ecf66..5a2ec2d 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,6 @@ Name: simh Version: 3.9.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -73,6 +73,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.9.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 3.9.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a54dfa99cabeda7e8ca224032a1ff72b737387af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:23:35 +0000 Subject: [PATCH 12/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 5a2ec2d..8c732ad 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,6 @@ Name: simh Version: 3.9.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -73,6 +73,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 3.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 3.9.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0b6a1f70bf016e9ab5c6d93164477191f3c27aa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:32:23 +0000 Subject: [PATCH 13/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 8c732ad..e917228 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,6 @@ Name: simh Version: 3.9.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -73,6 +73,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.9.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 3.9.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c60c2b4400ce2c02cc9f7ff95ad55945baa61026 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 5 Apr 2020 23:54:01 +0200 Subject: [PATCH 14/37] sync with latest upstream release --- .gitignore | 1 + simh-generate-tarball.sh | 4 ++-- simh.spec | 16 +++++++++++----- sources | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) 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 From f6a2ac2923f67105830f69d403efe678562b16d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:49:48 +0000 Subject: [PATCH 15/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 485c9b0..f41ad01 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -74,6 +74,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.11.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Apr 05 2020 Lucian Langa - 3.9.0-14 - update generation script - apply temporary gcc10 fix From bfb847024c32d9d871809869235237ab06d8bf95 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:31:30 +0000 Subject: [PATCH 16/37] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- simh.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/simh.spec b/simh.spec index f41ad01..d19da44 100644 --- a/simh.spec +++ b/simh.spec @@ -19,6 +19,7 @@ Source0: simh-%{version}-noroms.tar.gz Source1: simh-generate-tarball.sh +BuildRequires: make BuildRequires: gcc BuildRequires: libpcap-devel, dos2unix #Requires: From 4a95406809e4c502b7955a7c2963d4025f779512 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:28:59 +0000 Subject: [PATCH 17/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index d19da44..48f48d6 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -75,6 +75,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.11.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.11.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 008fd86fe505026f3709bcd231a0c8303f23afc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:39:36 +0000 Subject: [PATCH 18/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 48f48d6..1cdc913 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -75,6 +75,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.11.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 3.11.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 425542238d814ed6f6f20ee476de9703883f7a07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:59:49 +0000 Subject: [PATCH 19/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 1cdc913..d9065c2 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -75,6 +75,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.11.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.11.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6aed822c31117532fe0c5caa5405d87c0044d773 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:42:29 +0000 Subject: [PATCH 20/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index d9065c2..dbc3262 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -75,6 +75,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 3.11.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5ab0da62b10c31fc3e12b7ad11e60ece5300ab91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:21:48 +0000 Subject: [PATCH 21/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index dbc3262..0ed3058 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -75,6 +75,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.11.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From dc7fade20cf58c5d38279111fc4bdd6bb43b3f59 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Tue, 24 Jan 2023 15:30:27 +0100 Subject: [PATCH 22/37] fix FTBFS (#2047013) --- simh.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 0ed3058..c64bd7c 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -17,6 +17,7 @@ Source0: simh-%{version}-noroms.tar.gz # tarball's directory: # ./simh-generate-tarball.sh 3.8.1 Source1: simh-generate-tarball.sh +Patch0: simh-3.11.0-crl.patch BuildRequires: make @@ -48,10 +49,13 @@ SIMH implements simulators for: %prep %setup -qn %{name}-%{version}/sim +%patch0 -p2 %build mkdir -p BIN +CC="$CC -I . -fPIE -g" +LDFLAGS="$LDFLAGS -lm" make %{?_smp_mflags} -e ROMS_OPT="%{optflags}" USE_NETWORK=1 @@ -75,6 +79,10 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Tue Jan 24 2023 Lucian Langa - 3.11.0-21 +- add patch from Joshua Cogliati to fix FTBFS +- update build flags + * Sat Jan 21 2023 Fedora Release Engineering - 3.11.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8650beeb1f7f2810a5bc3b7f996928eb53bda2cd Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Tue, 24 Jan 2023 15:33:44 +0100 Subject: [PATCH 23/37] fix FTBFS (#2047013) - take II --- simh-3.11.0-crl.patch | 48 +++++++++++++++++++++++++++++++++++++++++++ simh.spec | 5 ++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 simh-3.11.0-crl.patch diff --git a/simh-3.11.0-crl.patch b/simh-3.11.0-crl.patch new file mode 100644 index 0000000..23c5c10 --- /dev/null +++ b/simh-3.11.0-crl.patch @@ -0,0 +1,48 @@ +diff '--color=auto' -Naur simh-3.11.0/sim/PDP11/pdp11_defs.h simh-3.11.0-mod/sim/PDP11/pdp11_defs.h +--- simh-3.11.0/sim/PDP11/pdp11_defs.h 2017-02-10 15:31:48.000000000 +0100 ++++ simh-3.11.0-mod/sim/PDP11/pdp11_defs.h 2023-01-24 07:58:53.969038121 +0100 +@@ -900,7 +900,7 @@ + #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); +diff '--color=auto' -Naur simh-3.11.0/sim/sim_fio.c simh-3.11.0-mod/sim/sim_fio.c +--- simh-3.11.0/sim/sim_fio.c 2019-02-05 14:03:02.000000000 +0100 ++++ simh-3.11.0-mod/sim/sim_fio.c 2023-01-24 07:59:00.666042586 +0100 +@@ -182,7 +182,7 @@ + #if defined (VMS) + return fopen (file, mode, "ALQ=32", "DEQ=4096", + "MBF=6", "MBC=127", "FOP=cbt,tef", "ROP=rah,wbh", "CTX=stm"); +-#elif (defined (__linux) || defined (__linux__) || defined (__hpux) || defined (_AIX)) && !defined (DONT_DO_LARGEFILE) ++#elif (defined (__hpux) || defined (_AIX)) && !defined (DONT_DO_LARGEFILE) + return fopen64 (file, mode); + #else + return fopen (file, mode); +@@ -261,9 +261,9 @@ + + #endif /* end Windows */ + +-/* Linux, HP/UX, and AIX */ ++/* HP/UX, and AIX */ + +-#if defined (__linux) || defined (__linux__) || defined (__hpux) || defined (_AIX) ++#if defined (__hpux) || defined (_AIX) + #define S_SIM_IO_FSEEK_EXT_ 1 + + int sim_fseeko (FILE *st, t_offset xpos, int origin) +@@ -278,9 +278,9 @@ + + #endif /* end Linux with LFS */ + +-/* Apple OS/X and the BSD family */ ++/* Linux, Apple OS/X and the BSD family */ + +-#if defined (__APPLE__) || defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) ++#if defined (__linux) || defined (__linux__) || defined (__APPLE__) || defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) + #define S_SIM_IO_FSEEK_EXT_ 1 + + int sim_fseeko (FILE *st, t_offset xpos, int origin) diff --git a/simh.spec b/simh.spec index c64bd7c..d7edc34 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -79,6 +79,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Tue Jan 24 2023 Lucian Langa - 3.11.0-22 +- forgot the patch file in previous commit + * Tue Jan 24 2023 Lucian Langa - 3.11.0-21 - add patch from Joshua Cogliati to fix FTBFS - update build flags From 95cb7bbb53112c38405737f96cdad75b544e4463 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:47:40 +0000 Subject: [PATCH 24/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index d7edc34..7beb428 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -79,6 +79,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.11.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jan 24 2023 Lucian Langa - 3.11.0-22 - forgot the patch file in previous commit From 75ae234d801e0b643302ed7388ce853d7c154e74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:20:50 +0000 Subject: [PATCH 25/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 7beb428..36b03f8 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -79,6 +79,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.11.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.11.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a2619cd34cc0b29c5f60dd5c5277c9c660d5d878 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 26/37] Eliminate use of obsolete %patchN syntax (#2283636) --- simh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 36b03f8..89956d1 100644 --- a/simh.spec +++ b/simh.spec @@ -49,7 +49,7 @@ SIMH implements simulators for: %prep %setup -qn %{name}-%{version}/sim -%patch0 -p2 +%patch -P0 -p2 %build From 7d88e20fe0ec3167adf9658a6d76b9c0848dd91b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:41:46 +0000 Subject: [PATCH 27/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 89956d1..08d3511 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -79,6 +79,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.11.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 3.11.0-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 67130ef15103b6002fce6b1f6218c1a28b5dd63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 21:57:54 +0200 Subject: [PATCH 28/37] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- simh.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/simh.spec b/simh.spec index 08d3511..4dfa585 100644 --- a/simh.spec +++ b/simh.spec @@ -1,13 +1,14 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code #in there, notably in AltairZ80/. #(each target is compiled into its own binary, so only AltairZ80 is GPL+) -License: MIT and GPL+ +# Automatically converted from old format: MIT and GPL+ - review is highly recommended. +License: LicenseRef-Callaway-MIT AND GPL-1.0-or-later URL: http://simh.trailing-edge.com/ Source0: simh-%{version}-noroms.tar.gz @@ -79,6 +80,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Wed Sep 04 2024 Miroslav Suchý - 3.11.0-26 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.11.0-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b34a1873bfb704fe9a3c95b6810721e983f21f6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:49:02 +0000 Subject: [PATCH 29/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- simh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simh.spec b/simh.spec index 4dfa585..7928f51 100644 --- a/simh.spec +++ b/simh.spec @@ -1,7 +1,7 @@ %define _legacy_common_support 1 Name: simh Version: 3.11.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -80,6 +80,9 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.11.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 3.11.0-26 - convert license to SPDX From e72638562c44000c01d9fd181263881a34428b63 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 25 Feb 2025 21:06:40 -0800 Subject: [PATCH 30/37] Convert the specs from tabs to spaces --- simh.spec | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/simh.spec b/simh.spec index 7928f51..71acdee 100644 --- a/simh.spec +++ b/simh.spec @@ -1,29 +1,29 @@ %define _legacy_common_support 1 -Name: simh -Version: 3.11.0 -Release: 27%{?dist} -Summary: A highly portable, multi-system emulator +Name: simh +Version: 3.11.0 +Release: 27%{?dist} +Summary: A highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code #in there, notably in AltairZ80/. #(each target is compiled into its own binary, so only AltairZ80 is GPL+) # Automatically converted from old format: MIT and GPL+ - review is highly recommended. -License: LicenseRef-Callaway-MIT AND GPL-1.0-or-later +License: LicenseRef-Callaway-MIT AND GPL-1.0-or-later -URL: http://simh.trailing-edge.com/ -Source0: simh-%{version}-noroms.tar.gz +URL: http://simh.trailing-edge.com/ +Source0: simh-%{version}-noroms.tar.gz # we use # this script to remove the roms binary and patented code before shipping it. # Download the upstream tarball and invoke this script while in the # tarball's directory: # ./simh-generate-tarball.sh 3.8.1 -Source1: simh-generate-tarball.sh -Patch0: simh-3.11.0-crl.patch +Source1: simh-generate-tarball.sh +Patch0: simh-3.11.0-crl.patch BuildRequires: make BuildRequires: gcc -BuildRequires: libpcap-devel, dos2unix +BuildRequires: libpcap-devel, dos2unix #Requires: %description @@ -64,7 +64,7 @@ make %{?_smp_mflags} -e ROMS_OPT="%{optflags}" USE_NETWORK=1 rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} for i in `ls BIN/`; do - install -p -m 755 BIN/$i $RPM_BUILD_ROOT%{_bindir}/simh-$i + install -p -m 755 BIN/$i $RPM_BUILD_ROOT%{_bindir}/simh-$i done mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} for i in `find -iname "*.txt"`; do dos2unix -k $i; done @@ -78,8 +78,10 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %doc S3/haltguide.txt S3/readme_s3.txt S3/system3.txt SDS/sds_diag.txt %doc VAX/vax780_bug_history.txt - %changelog +* Tue Feb 25 2025 Davide Cavalca - 3.11.0-28 +- Convert the spec from tabs to spaces + * Sun Jan 19 2025 Fedora Release Engineering - 3.11.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0a579b1218a5fae4c726263abc3c6acfb4640d60 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 25 Feb 2025 21:10:25 -0800 Subject: [PATCH 31/37] Refactor and update the spec to follow the latest packaging guidelines --- simh.spec | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/simh.spec b/simh.spec index 71acdee..9e7fb34 100644 --- a/simh.spec +++ b/simh.spec @@ -1,30 +1,31 @@ %define _legacy_common_support 1 -Name: simh -Version: 3.11.0 -Release: 27%{?dist} -Summary: A highly portable, multi-system emulator + +Name: simh +Version: 3.11.0 +Release: 28%{?dist} +Summary: Highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code #in there, notably in AltairZ80/. #(each target is compiled into its own binary, so only AltairZ80 is GPL+) # Automatically converted from old format: MIT and GPL+ - review is highly recommended. -License: LicenseRef-Callaway-MIT AND GPL-1.0-or-later +License: LicenseRef-Callaway-MIT AND GPL-1.0-or-later -URL: http://simh.trailing-edge.com/ -Source0: simh-%{version}-noroms.tar.gz +URL: http://simh.trailing-edge.com/ +Source0: simh-%{version}-noroms.tar.gz # we use # this script to remove the roms binary and patented code before shipping it. # Download the upstream tarball and invoke this script while in the # tarball's directory: # ./simh-generate-tarball.sh 3.8.1 -Source1: simh-generate-tarball.sh -Patch0: simh-3.11.0-crl.patch +Source1: simh-generate-tarball.sh +Patch: simh-3.11.0-crl.patch - -BuildRequires: make +BuildRequires: dos2unix BuildRequires: gcc -BuildRequires: libpcap-devel, dos2unix -#Requires: +BuildRequires: make + +BuildRequires: libpcap-devel %description SIMH is a historical computer simulation system. It consists of simulators @@ -52,24 +53,19 @@ SIMH implements simulators for: %setup -qn %{name}-%{version}/sim %patch -P0 -p2 - %build mkdir -p BIN CC="$CC -I . -fPIE -g" LDFLAGS="$LDFLAGS -lm" -make %{?_smp_mflags} -e ROMS_OPT="%{optflags}" USE_NETWORK=1 - +%make_build -e ROMS_OPT="%{optflags}" USE_NETWORK=1 %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} for i in `ls BIN/`; do - install -p -m 755 BIN/$i $RPM_BUILD_ROOT%{_bindir}/simh-$i + install -Dpm755 BIN/$i %{buildroot}%{_bindir}/simh-$i done -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} +mkdir -p %{buildroot}%{_docdir}/%{name} for i in `find -iname "*.txt"`; do dos2unix -k $i; done - %files %{_bindir}/* %doc ALTAIR/altair.txt NOVA/eclipse.txt 0readme_311.txt 0readme_ethernet.txt @@ -81,6 +77,7 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %changelog * Tue Feb 25 2025 Davide Cavalca - 3.11.0-28 - Convert the spec from tabs to spaces +- Refactor and update the spec to follow the latest packaging guidelines * Sun Jan 19 2025 Fedora Release Engineering - 3.11.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3846d3295c9778281d0aedab7ca8a52281c04807 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 25 Feb 2025 21:11:42 -0800 Subject: [PATCH 32/37] Convert to rpmautospec --- changelog | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++ simh.spec | 132 +----------------------------------------------------- 2 files changed, 131 insertions(+), 130 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..2e22ae8 --- /dev/null +++ b/changelog @@ -0,0 +1,129 @@ +* Tue Feb 25 2025 Davide Cavalca - 3.11.0-28 +- Convert the spec from tabs to spaces +- Refactor and update the spec to follow the latest packaging guidelines + +* Sun Jan 19 2025 Fedora Release Engineering - 3.11.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 3.11.0-26 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 3.11.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.11.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 3.11.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jan 24 2023 Lucian Langa - 3.11.0-22 +- forgot the patch file in previous commit + +* Tue Jan 24 2023 Lucian Langa - 3.11.0-21 +- add patch from Joshua Cogliati to fix FTBFS +- update build flags + +* Sat Jan 21 2023 Fedora Release Engineering - 3.11.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.11.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.11.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.11.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.11.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* 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 + +* Fri Jul 26 2019 Fedora Release Engineering - 3.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 3.9.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.9.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 3.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.9.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.9.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 3.9.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 3.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 3.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 3.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Jan 24 2014 Lucian Langa - 3.9.0-1 +- sync with latest upstream stable +- drop all patches - fixed upstream +- fix bogus dates + +* Tue Aug 06 2013 Lucian Langa - 3.8.1-11 +- don't create versioned docdir + +* Sun Aug 04 2013 Fedora Release Engineering - 3.8.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 3.8.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 3.8.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 3.8.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed May 19 2010 Lucian Langa - 3.8.1-6 +- bump rel to fix NVR higher than previous version + +* Sat Jan 09 2010 Lucian Langa - 3.8.1-5 +- fix altair segfault + +* Tue Nov 17 2009 Lucian Langa - 3.8.1-4 +- add correct source + +* Fri Nov 13 2009 Lucian Langa - 3.8.1-3 +- update description + +* Sun Nov 08 2009 Lucian Langa - 3.8.1-2 +- add correct generate script + +* Thu Oct 08 2009 Lucian Langa - 3.8.1-1 +- remove separate docs +- misc cleanups +- new upstream release + +* Wed Dec 24 2008 Lucian Langa - 3.8.0-1 +- initial spec file + + diff --git a/simh.spec b/simh.spec index 9e7fb34..d2c86d0 100644 --- a/simh.spec +++ b/simh.spec @@ -2,7 +2,7 @@ Name: simh Version: 3.11.0 -Release: 28%{?dist} +Release: %autorelease Summary: Highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code @@ -75,132 +75,4 @@ for i in `find -iname "*.txt"`; do dos2unix -k $i; done %doc VAX/vax780_bug_history.txt %changelog -* Tue Feb 25 2025 Davide Cavalca - 3.11.0-28 -- Convert the spec from tabs to spaces -- Refactor and update the spec to follow the latest packaging guidelines - -* Sun Jan 19 2025 Fedora Release Engineering - 3.11.0-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 04 2024 Miroslav Suchý - 3.11.0-26 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 3.11.0-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 3.11.0-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 3.11.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jan 24 2023 Lucian Langa - 3.11.0-22 -- forgot the patch file in previous commit - -* Tue Jan 24 2023 Lucian Langa - 3.11.0-21 -- add patch from Joshua Cogliati to fix FTBFS -- update build flags - -* Sat Jan 21 2023 Fedora Release Engineering - 3.11.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 3.11.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 3.11.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.11.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 3.11.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.11.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* 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 - -* Fri Jul 26 2019 Fedora Release Engineering - 3.9.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.9.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 3.9.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 3.9.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 3.9.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.9.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 3.9.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 3.9.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 3.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 3.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 3.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Jan 24 2014 Lucian Langa - 3.9.0-1 -- sync with latest upstream stable -- drop all patches - fixed upstream -- fix bogus dates - -* Tue Aug 06 2013 Lucian Langa - 3.8.1-11 -- don't create versioned docdir - -* Sun Aug 04 2013 Fedora Release Engineering - 3.8.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 3.8.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 3.8.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 3.8.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed May 19 2010 Lucian Langa - 3.8.1-6 -- bump rel to fix NVR higher than previous version - -* Sat Jan 09 2010 Lucian Langa - 3.8.1-5 -- fix altair segfault - -* Tue Nov 17 2009 Lucian Langa - 3.8.1-4 -- add correct source - -* Fri Nov 13 2009 Lucian Langa - 3.8.1-3 -- update description - -* Sun Nov 08 2009 Lucian Langa - 3.8.1-2 -- add correct generate script - -* Thu Oct 08 2009 Lucian Langa - 3.8.1-1 -- remove separate docs -- misc cleanups -- new upstream release - -* Wed Dec 24 2008 Lucian Langa - 3.8.0-1 -- initial spec file - - +%autochangelog From 9ca8696a4382ce1cf1d8b941b829d6b92189f99e Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 25 Feb 2025 21:46:25 -0800 Subject: [PATCH 33/37] Update to 3.12.5; Fixes: RHBZ#2341352 --- .gitignore | 1 + build-fix.patch | 12 ++++++++ simh-3.11.0-crl.patch | 48 -------------------------------- simh-3.8.0-gcc.patch | 15 ---------- simh-3.8.1-altair-segfault.patch | 12 -------- simh.spec | 21 +++++++------- sources | 2 +- 7 files changed, 24 insertions(+), 87 deletions(-) create mode 100644 build-fix.patch delete mode 100644 simh-3.11.0-crl.patch delete mode 100644 simh-3.8.0-gcc.patch delete mode 100644 simh-3.8.1-altair-segfault.patch diff --git a/.gitignore b/.gitignore index 774eed4..6ff1285 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ simh-3.8.1-noroms.tar.gz /simh-3.9.0-noroms.tar.gz /simh-3.11.0-noroms.tar.gz +/simh-3.12.5-noroms.tar.gz diff --git a/build-fix.patch b/build-fix.patch new file mode 100644 index 0000000..626ea49 --- /dev/null +++ b/build-fix.patch @@ -0,0 +1,12 @@ +diff -wbBur sim/PDP11/pdp11_ch.c sim.q/PDP11/pdp11_ch.c +--- sim/PDP11/pdp11_ch.c 2024-05-05 11:03:00.000000000 +0300 ++++ sim.q/PDP11/pdp11_ch.c 2024-11-17 00:33:07.981278910 +0300 +@@ -271,7 +271,7 @@ + CONST uint8 *p; + + tmxr_poll_rx (&ch_tmxr); +- if (tmxr_get_packet_ln (&ch_lines[0], &p, &count) != SCPE_OK) { ++ if (tmxr_get_packet_ln (&ch_lines[0], (void*)&p, &count) != SCPE_OK) { + sim_debug (DBG_ERR, &ch_dev, "TMXR error receiving packet\n"); + return 0; + } diff --git a/simh-3.11.0-crl.patch b/simh-3.11.0-crl.patch deleted file mode 100644 index 23c5c10..0000000 --- a/simh-3.11.0-crl.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff '--color=auto' -Naur simh-3.11.0/sim/PDP11/pdp11_defs.h simh-3.11.0-mod/sim/PDP11/pdp11_defs.h ---- simh-3.11.0/sim/PDP11/pdp11_defs.h 2017-02-10 15:31:48.000000000 +0100 -+++ simh-3.11.0-mod/sim/PDP11/pdp11_defs.h 2023-01-24 07:58:53.969038121 +0100 -@@ -900,7 +900,7 @@ - #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); -diff '--color=auto' -Naur simh-3.11.0/sim/sim_fio.c simh-3.11.0-mod/sim/sim_fio.c ---- simh-3.11.0/sim/sim_fio.c 2019-02-05 14:03:02.000000000 +0100 -+++ simh-3.11.0-mod/sim/sim_fio.c 2023-01-24 07:59:00.666042586 +0100 -@@ -182,7 +182,7 @@ - #if defined (VMS) - return fopen (file, mode, "ALQ=32", "DEQ=4096", - "MBF=6", "MBC=127", "FOP=cbt,tef", "ROP=rah,wbh", "CTX=stm"); --#elif (defined (__linux) || defined (__linux__) || defined (__hpux) || defined (_AIX)) && !defined (DONT_DO_LARGEFILE) -+#elif (defined (__hpux) || defined (_AIX)) && !defined (DONT_DO_LARGEFILE) - return fopen64 (file, mode); - #else - return fopen (file, mode); -@@ -261,9 +261,9 @@ - - #endif /* end Windows */ - --/* Linux, HP/UX, and AIX */ -+/* HP/UX, and AIX */ - --#if defined (__linux) || defined (__linux__) || defined (__hpux) || defined (_AIX) -+#if defined (__hpux) || defined (_AIX) - #define S_SIM_IO_FSEEK_EXT_ 1 - - int sim_fseeko (FILE *st, t_offset xpos, int origin) -@@ -278,9 +278,9 @@ - - #endif /* end Linux with LFS */ - --/* Apple OS/X and the BSD family */ -+/* Linux, Apple OS/X and the BSD family */ - --#if defined (__APPLE__) || defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) -+#if defined (__linux) || defined (__linux__) || defined (__APPLE__) || defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) - #define S_SIM_IO_FSEEK_EXT_ 1 - - int sim_fseeko (FILE *st, t_offset xpos, int origin) diff --git a/simh-3.8.0-gcc.patch b/simh-3.8.0-gcc.patch deleted file mode 100644 index 8b5ba50..0000000 --- a/simh-3.8.0-gcc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- simh/makefile 2008-06-06 15:00:46.000000000 +0300 -+++ simh-mod/makefile 2008-12-24 11:39:05.000000000 +0200 -@@ -12,10 +12,10 @@ - OS_CCDEFS = -lrt -lm -D_GNU_SOURCE - endif - endif -- CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I . -+ CC = gcc -std=gnu89 -U__STRICT_ANSI__ -g $(OS_CCDEFS) $(OPT) -I . - ifeq ($(USE_NETWORK),) - else -- NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a -+ NETWORK_OPT = -DUSE_NETWORK -lpcap - endif - else - #Win32 Environments diff --git a/simh-3.8.1-altair-segfault.patch b/simh-3.8.1-altair-segfault.patch deleted file mode 100644 index cb04fa3..0000000 --- a/simh-3.8.1-altair-segfault.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur simh-3.8.1/ALTAIR/altair_dsk.c simh-3.8.1-mod/ALTAIR/altair_dsk.c ---- simh-3.8.1/ALTAIR/altair_dsk.c 2005-08-26 21:47:22.000000000 +0300 -+++ simh-3.8.1-mod/ALTAIR/altair_dsk.c 2009-11-14 21:22:23.000000000 +0200 -@@ -325,6 +325,8 @@ - cur_sect[cur_disk]);*/ - pos = DSK_TRACSIZE * cur_track[cur_disk]; - pos += DSK_SECTSIZE * cur_sect[cur_disk]; -+ if ((uptr == NULL) || (uptr->fileref == NULL)) -+ return 0; - rtn = fseek(uptr -> fileref, pos, 0); - rtn = fread(dskbuf, 137, 1, uptr -> fileref); - cur_byte[cur_disk] = 1; diff --git a/simh.spec b/simh.spec index d2c86d0..878b8a4 100644 --- a/simh.spec +++ b/simh.spec @@ -1,15 +1,15 @@ %define _legacy_common_support 1 +#global _smp_build_ncpus 1 Name: simh -Version: 3.11.0 +Version: 3.12.5 Release: %autorelease Summary: Highly portable, multi-system emulator #The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code #in there, notably in AltairZ80/. #(each target is compiled into its own binary, so only AltairZ80 is GPL+) -# Automatically converted from old format: MIT and GPL+ - review is highly recommended. -License: LicenseRef-Callaway-MIT AND GPL-1.0-or-later +License: MIT AND GPL-1.0-or-later URL: http://simh.trailing-edge.com/ Source0: simh-%{version}-noroms.tar.gz @@ -19,7 +19,7 @@ Source0: simh-%{version}-noroms.tar.gz # tarball's directory: # ./simh-generate-tarball.sh 3.8.1 Source1: simh-generate-tarball.sh -Patch: simh-3.11.0-crl.patch +Patch: https://gitlab.archlinux.org/archlinux/packaging/packages/simh/-/raw/3.12.5-1/build-fix.patch BuildRequires: dos2unix BuildRequires: gcc @@ -50,25 +50,24 @@ SIMH implements simulators for: * Scientific Data Systems SDS 940 %prep -%setup -qn %{name}-%{version}/sim -%patch -P0 -p2 +%autosetup -n %{name}-%{version}/sim -p1 %build mkdir -p BIN -CC="$CC -I . -fPIE -g" -LDFLAGS="$LDFLAGS -lm" -%make_build -e ROMS_OPT="%{optflags}" USE_NETWORK=1 +CC="$CC -I . -fPIE -g -D_LARGEFILE64_SOURCE" +LDFLAGS="$LDFLAGS -lm -lpcap" +%make_build -e ROMS_OPT="%{optflags}" USE_NETWORK=1 LIBPATH="${_libdir}" %install for i in `ls BIN/`; do - install -Dpm755 BIN/$i %{buildroot}%{_bindir}/simh-$i + [ -f BIN/$i ] && install -Dpm755 BIN/$i %{buildroot}%{_bindir}/simh-$i done mkdir -p %{buildroot}%{_docdir}/%{name} for i in `find -iname "*.txt"`; do dos2unix -k $i; done %files %{_bindir}/* -%doc ALTAIR/altair.txt NOVA/eclipse.txt 0readme_311.txt 0readme_ethernet.txt +%doc ALTAIR/altair.txt NOVA/eclipse.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 diff --git a/sources b/sources index 93591cc..948f0c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (simh-3.11.0-noroms.tar.gz) = f4561701d67b774f56364ae7706a9a27a4030c52528db0198893b6ef8793124e3a9264b8d3b16a69d7084bd4e74c1cdaa897a8b2626ac679beadcaad217c0513 +SHA512 (simh-3.12.5-noroms.tar.gz) = 5441199cebc35e49f44fddbc049c29680c1d00aac2c514f2cb3a9649188d6c3f50613e647d7de9b064a4b2d5e81037854efb056891033c240331edf69c9fbbb3 From b1fd6b49c8f9add2cb4951c9426382aae0a8fa4c Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 25 Feb 2025 22:07:29 -0800 Subject: [PATCH 34/37] Fix patch application --- simh.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/simh.spec b/simh.spec index 878b8a4..6e30cf0 100644 --- a/simh.spec +++ b/simh.spec @@ -1,6 +1,3 @@ -%define _legacy_common_support 1 -#global _smp_build_ncpus 1 - Name: simh Version: 3.12.5 Release: %autorelease @@ -50,7 +47,8 @@ SIMH implements simulators for: * Scientific Data Systems SDS 940 %prep -%autosetup -n %{name}-%{version}/sim -p1 +%autosetup -n %{name}-%{version} -p0 +mv sim/* . && rmdir sim %build mkdir -p BIN From c31ac52fb03c3bb532cb5e7b9377a442f3c47fa1 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 25 Feb 2025 22:30:08 -0800 Subject: [PATCH 35/37] Refresh the patch to fix the line endings This patch uses DOS line endings (as that's what the sources use too), but git "helpfully" converted them to UNIX ones by default, thus breaking it. Trying again after doing: git config --local core.autocrlf false and refreshing it. --- build-fix.patch | 16 ++++++++-------- simh.spec | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build-fix.patch b/build-fix.patch index 626ea49..18df6de 100644 --- a/build-fix.patch +++ b/build-fix.patch @@ -2,11 +2,11 @@ diff -wbBur sim/PDP11/pdp11_ch.c sim.q/PDP11/pdp11_ch.c --- sim/PDP11/pdp11_ch.c 2024-05-05 11:03:00.000000000 +0300 +++ sim.q/PDP11/pdp11_ch.c 2024-11-17 00:33:07.981278910 +0300 @@ -271,7 +271,7 @@ - CONST uint8 *p; - - tmxr_poll_rx (&ch_tmxr); -- if (tmxr_get_packet_ln (&ch_lines[0], &p, &count) != SCPE_OK) { -+ if (tmxr_get_packet_ln (&ch_lines[0], (void*)&p, &count) != SCPE_OK) { - sim_debug (DBG_ERR, &ch_dev, "TMXR error receiving packet\n"); - return 0; - } + CONST uint8 *p; + + tmxr_poll_rx (&ch_tmxr); +- if (tmxr_get_packet_ln (&ch_lines[0], &p, &count) != SCPE_OK) { ++ if (tmxr_get_packet_ln (&ch_lines[0], (void*)&p, &count) != SCPE_OK) { + sim_debug (DBG_ERR, &ch_dev, "TMXR error receiving packet\n"); + return 0; + } diff --git a/simh.spec b/simh.spec index 6e30cf0..4c4795d 100644 --- a/simh.spec +++ b/simh.spec @@ -47,8 +47,7 @@ SIMH implements simulators for: * Scientific Data Systems SDS 940 %prep -%autosetup -n %{name}-%{version} -p0 -mv sim/* . && rmdir sim +%autosetup -n %{name}-%{version}/sim -p1 %build mkdir -p BIN From c0770bd773c958cfaeb676a1f3a468e93ff5ebed Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Mon, 3 Mar 2025 09:22:22 -0800 Subject: [PATCH 36/37] More spec improvements --- simh.spec | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/simh.spec b/simh.spec index 4c4795d..0a73311 100644 --- a/simh.spec +++ b/simh.spec @@ -3,9 +3,9 @@ Version: 3.12.5 Release: %autorelease Summary: Highly portable, multi-system emulator -#The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code -#in there, notably in AltairZ80/. -#(each target is compiled into its own binary, so only AltairZ80 is GPL+) +# The licensing is mostly MIT, but there is also some GPL+ (literally, v1+) code +# in there, notably in AltairZ80/. +# (each target is compiled into its own binary, so only AltairZ80 is GPL+) License: MIT AND GPL-1.0-or-later URL: http://simh.trailing-edge.com/ @@ -18,9 +18,9 @@ Source0: simh-%{version}-noroms.tar.gz Source1: simh-generate-tarball.sh Patch: https://gitlab.archlinux.org/archlinux/packaging/packages/simh/-/raw/3.12.5-1/build-fix.patch -BuildRequires: dos2unix BuildRequires: gcc BuildRequires: make +BuildRequires: sed BuildRequires: libpcap-devel @@ -49,21 +49,44 @@ SIMH implements simulators for: %prep %autosetup -n %{name}-%{version}/sim -p1 +# Convert docs to UNIX line endings +sed -i 's/\r$//' */*.txt + %build -mkdir -p BIN CC="$CC -I . -fPIE -g -D_LARGEFILE64_SOURCE" LDFLAGS="$LDFLAGS -lm -lpcap" %make_build -e ROMS_OPT="%{optflags}" USE_NETWORK=1 LIBPATH="${_libdir}" %install -for i in `ls BIN/`; do - [ -f BIN/$i ] && install -Dpm755 BIN/$i %{buildroot}%{_bindir}/simh-$i +for i in BIN/*; do + [ -f "$i" ] && install -Dpm0755 "$i" "%{buildroot}%{_bindir}/simh-$(basename "$i")" done -mkdir -p %{buildroot}%{_docdir}/%{name} -for i in `find -iname "*.txt"`; do dos2unix -k $i; done %files -%{_bindir}/* +%{_bindir}/simh-altair +%{_bindir}/simh-eclipse +%{_bindir}/simh-gri +%{_bindir}/simh-h316 +%{_bindir}/simh-i1401 +%{_bindir}/simh-i1620 +%{_bindir}/simh-i7094 +%{_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-sds +%{_bindir}/simh-sigma +%{_bindir}/simh-uc15 +%{_bindir}/simh-vax +%{_bindir}/simh-vax780 %doc ALTAIR/altair.txt NOVA/eclipse.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 From f72c3331d22d7e57458867c935f6f65fd6c77218 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:20:53 +0000 Subject: [PATCH 37/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild