From 537d172d957c133094439e47d8245eecb40faa76 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 1 Jan 2025 14:42:16 -0800 Subject: [PATCH 1/8] Conflict with the sdl-hercules packages --- hercules.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hercules.spec b/hercules.spec index b4bb469..cd2b6e4 100644 --- a/hercules.spec +++ b/hercules.spec @@ -1,7 +1,7 @@ Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules Version: 3.13 -Release: 18%{?dist} +Release: 19%{?dist} # Automatically converted from old format: QPL - review is highly recommended. License: QPL-1.0 URL: http://www.hercules-390.eu/ @@ -19,7 +19,8 @@ BuildRequires: libcap-devel BuildRequires: libtool BuildRequires: libtool-ltdl-devel BuildRequires: make - +Conflicts: sdl-hercules +Conflicts: sdl-hercules-data %description Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture @@ -100,6 +101,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Wed Jan 01 2025 Davide Cavalca - 3.13-19 +- Conflict with the sdl-hercules packages + * Wed Aug 07 2024 Miroslav Suchý - 3.13-18 - convert license to SPDX From 3df00227cce835b426bb8ea8dd3109dcdc26d1fd Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 1 Jan 2025 14:46:37 -0800 Subject: [PATCH 2/8] Drop old comments that trigger a FTBFS due to macro expansion --- hercules.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hercules.spec b/hercules.spec index cd2b6e4..497469f 100644 --- a/hercules.spec +++ b/hercules.spec @@ -6,7 +6,6 @@ Release: 19%{?dist} License: QPL-1.0 URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz -#Source0: https://github.com/rbowler/spinhawk/archive/%{version}.tar.gz Source1: hercules.cnf Source2: hercules-run Source3: README-rpm @@ -32,7 +31,6 @@ printer-keyboard, 3270 terminal, and 3287 printer devices. %prep -#%setup -q -n spinhawk-%{version} %setup -q %patch -P0 -p1 -b .fedora @@ -103,6 +101,8 @@ rm %{buildroot}%{_libdir}/*.la %changelog * Wed Jan 01 2025 Davide Cavalca - 3.13-19 - Conflict with the sdl-hercules packages +- Drop old comments that trigger a FTBFS due to macro expansion + Fixes: RHBZ#2300839 * Wed Aug 07 2024 Miroslav Suchý - 3.13-18 - convert license to SPDX From d51bee72f8f117c23e70f00af5022c2bd7797bcd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:29:23 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 497469f..78bbf8e 100644 --- a/hercules.spec +++ b/hercules.spec @@ -1,7 +1,7 @@ Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules Version: 3.13 -Release: 19%{?dist} +Release: 20%{?dist} # Automatically converted from old format: QPL - review is highly recommended. License: QPL-1.0 URL: http://www.hercules-390.eu/ @@ -99,6 +99,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Mon Jan 20 2025 Fedora Release Engineering - 3.13-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 01 2025 Davide Cavalca - 3.13-19 - Conflict with the sdl-hercules packages - Drop old comments that trigger a FTBFS due to macro expansion From 63093c535ff7b0af1bab1c4befc47679933ab459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 15 Apr 2025 14:46:38 +0200 Subject: [PATCH 4/8] revert back to older C standard as the code base is also old --- hercules.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 78bbf8e..106a87d 100644 --- a/hercules.spec +++ b/hercules.spec @@ -51,7 +51,7 @@ rm util/Makefile* %build %configure \ --enable-external-gui \ - --enable-optimization="%{optflags}" + --enable-optimization="%{optflags} -std=gnu17" make %{?_smp_mflags} V=1 From 4c890525d9c2191f593f138b4df287c777a000bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 15 Apr 2025 14:56:53 +0200 Subject: [PATCH 5/8] update for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- hercules.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 106a87d..2b24e45 100644 --- a/hercules.spec +++ b/hercules.spec @@ -89,7 +89,6 @@ rm %{buildroot}%{_libdir}/*.la %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/hercules.cnf %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/generic.prm %{_bindir}/* -%{_sbindir}/* %{_datadir}/hercules/ %dir %{_libdir}/hercules/ %{_libdir}/hercules/*.so From 2b80cfd546aeab96333f55cfd89e2dece37849a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 15 Apr 2025 15:17:07 +0200 Subject: [PATCH 6/8] be more specific in file lists --- hercules.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hercules.spec b/hercules.spec index 2b24e45..1cd5100 100644 --- a/hercules.spec +++ b/hercules.spec @@ -88,11 +88,21 @@ rm %{buildroot}%{_libdir}/*.la %dir %{_sysconfdir}/hercules/ %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/hercules.cnf %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/generic.prm -%{_bindir}/* +%{_bindir}/cckd* +%{_bindir}/cfba* +%{_bindir}/ckd* +%{_bindir}/dasd* +%{_bindir}/dmap* +%{_bindir}/fba* +%{_bindir}/herc* +%{_bindir}/het* +%{_bindir}/tape* %{_datadir}/hercules/ %dir %{_libdir}/hercules/ %{_libdir}/hercules/*.so -%{_libdir}/*.so +%{_libdir}/libherc*.so +%{_libdir}/libdecNumber.so +%{_libdir}/libsoftfloat.so %{_mandir}/man?/* %dir %{_sharedstatedir}/hercules/ From 2d5fe0731c5f1d76c53d25ecb1f2288e04282ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 15 Apr 2025 18:16:35 +0200 Subject: [PATCH 7/8] drop i686 builds --- hercules.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hercules.spec b/hercules.spec index 1cd5100..65ca7ff 100644 --- a/hercules.spec +++ b/hercules.spec @@ -21,6 +21,9 @@ BuildRequires: make Conflicts: sdl-hercules Conflicts: sdl-hercules-data +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + %description Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture series of mainframe computers. It is capable of running any IBM operating From 67a00f4a07f0b7843107152ae296c5279a27b241 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:58:38 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 65ca7ff..a0ef2dc 100644 --- a/hercules.spec +++ b/hercules.spec @@ -1,7 +1,7 @@ Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules Version: 3.13 -Release: 20%{?dist} +Release: 21%{?dist} # Automatically converted from old format: QPL - review is highly recommended. License: QPL-1.0 URL: http://www.hercules-390.eu/ @@ -111,6 +111,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 3.13-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jan 20 2025 Fedora Release Engineering - 3.13-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild