From 23976e4bf623f04f7bb868f0f0331a31e1180a8c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 00:25:46 +0000 Subject: [PATCH 01/21] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- hercules.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/hercules.spec b/hercules.spec index 0b9f177..905ee97 100644 --- a/hercules.spec +++ b/hercules.spec @@ -16,6 +16,7 @@ BuildRequires: bzip2-devel BuildRequires: libcap-devel BuildRequires: libtool BuildRequires: libtool-ltdl-devel +BuildRequires: make %description From c815e66746f24ce613c356aea370e41b6e0a759c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 13:26:25 +0000 Subject: [PATCH 02/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 905ee97..b9b4abc 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: 7%{?dist} +Release: 8%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -97,6 +97,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 3.13-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d8caf0df61b79eb7f1470e5a07018e4764bb9564 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 07:35:12 +0000 Subject: [PATCH 03/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index b9b4abc..caf627a 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: 8%{?dist} +Release: 9%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -97,6 +97,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 3.13-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d51c4536a79570fa20334de3e62d36537bcd2134 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 12:18:02 +0000 Subject: [PATCH 04/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index caf627a..5cfe76b 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: 9%{?dist} +Release: 10%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -97,6 +97,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.13-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 3.13-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c85f37cb414b31f785e43701537cb925e94bec56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 13:35:37 +0000 Subject: [PATCH 05/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 5cfe76b..5e2e209 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: 10%{?dist} +Release: 11%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -97,6 +97,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.13-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 3.13-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 729a546d2f461764c9f80c249d475635bf6db8a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 12:05:36 +0000 Subject: [PATCH 06/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 5e2e209..f8a87f5 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: 11%{?dist} +Release: 12%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -97,6 +97,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.13-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 3.13-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From f0ab855c7a7bd423cc731e9d29f9488b582f515f Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 17 Mar 2023 11:50:42 +0100 Subject: [PATCH 07/21] Port configure script to C99 Related to: --- hercules-configure-c99.patch | 47 ++++++++++++++++++++++++++++++++++++ hercules.spec | 7 +++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 hercules-configure-c99.patch diff --git a/hercules-configure-c99.patch b/hercules-configure-c99.patch new file mode 100644 index 0000000..076453e --- /dev/null +++ b/hercules-configure-c99.patch @@ -0,0 +1,47 @@ +Avoid implicit function declarations in the configure script, for C99 +compatibility. Future compilers are likely not to accept implicit +function declarations by default. + +Submitted upstream: + +diff --git a/autoconf/hercules.m4 b/autoconf/hercules.m4 +index 52e211ac0c875df0..db4fa6fd5d87c6a5 100644 +--- a/autoconf/hercules.m4 ++++ b/autoconf/hercules.m4 +@@ -237,6 +237,7 @@ AC_DEFUN([_HC_CHECK_NEED_GETOPT_WRAPPER], + Will the linker complain about duplicate + symbols for getopt? We'll soon find out! + */ ++ int getopt(int, char *const[], const char *); + extern char *optarg; + extern int optind; + +@@ -261,6 +262,7 @@ DUPGETOPT1 + needs getopt. Will linker complain about + duplicate symbols for getopt? Let's see. + */ ++ int getopt(int, char *const[], const char *); + extern char *optarg; + extern int optind; + extern int test2(); +@@ -331,7 +333,7 @@ AC_DEFUN([HC_CHECK_NEED_GETOPT_OPTRESET], + [hc_cv_need_getopt_optreset], + [ + AC_TRY_LINK( +- [], ++ [int getopt(int, char *const[], const char *);], + [ + extern int optreset; + optreset=1; +diff --git a/configure.ac b/configure.ac +index 0558c902fec58379..71b2843a1efdfff0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -871,6 +871,7 @@ if test "$GCC" = "yes"; then + + -g -O2 -fomit-frame-pointer + */ ++ #include + + int foo () + { diff --git a/hercules.spec b/hercules.spec index f8a87f5..9bd830c 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: 12%{?dist} +Release: 13%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Source2: hercules-run Source3: README-rpm Source4: generic.prm Patch0: %{name}-3.10-fedora.patch +Patch1: hercules-configure-c99.patch BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: libcap-devel @@ -33,6 +34,7 @@ printer-keyboard, 3270 terminal, and 3287 printer devices. %setup -q %patch0 -p1 -b .fedora +%patch1 -p1 rm autoconf/libtool.m4 autoreconf -f -i @@ -97,6 +99,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Fri Mar 17 2023 Florian Weimer - 3.13-13 +- Port configure script to C99 + * Thu Jan 19 2023 Fedora Release Engineering - 3.13-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3a4344701b8c4fadf8da7a6e89a36de7a58e09c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 06:15:33 +0000 Subject: [PATCH 08/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 9bd830c..5e30a6e 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: 13%{?dist} +Release: 14%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -99,6 +99,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 3.13-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Mar 17 2023 Florian Weimer - 3.13-13 - Port configure script to C99 From bc6c21988245178102f47b7f24e1721a873b987d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 22:03:11 +0000 Subject: [PATCH 09/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 5e30a6e..6ebabe0 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: 14%{?dist} +Release: 15%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -99,6 +99,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 3.13-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 3.13-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e09ff685fb51fb2bbcdd9ab2649d89cfe12ad9ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 21:37:07 +0000 Subject: [PATCH 10/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 6ebabe0..1b5a9df 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: 15%{?dist} +Release: 16%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -99,6 +99,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.13-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 3.13-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ff63c864c182988edd682748c9ba089b89b4f176 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 11/21] Eliminate use of obsolete %patchN syntax (#2283636) --- hercules.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hercules.spec b/hercules.spec index 1b5a9df..807779c 100644 --- a/hercules.spec +++ b/hercules.spec @@ -33,8 +33,8 @@ printer-keyboard, 3270 terminal, and 3287 printer devices. #%setup -q -n spinhawk-%{version} %setup -q -%patch0 -p1 -b .fedora -%patch1 -p1 +%patch -P0 -p1 -b .fedora +%patch -P1 -p1 rm autoconf/libtool.m4 autoreconf -f -i From cef198de92458d11c6623064c4183c8d532d1fde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:11:56 +0000 Subject: [PATCH 12/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- hercules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hercules.spec b/hercules.spec index 807779c..df14d82 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: 16%{?dist} +Release: 17%{?dist} License: QPL URL: http://www.hercules-390.eu/ Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz @@ -99,6 +99,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 3.13-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 3.13-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 87de0a2ff6b1a83267d3b34a15d2da8bc5643de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 09:36:03 +0200 Subject: [PATCH 13/21] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- hercules.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hercules.spec b/hercules.spec index df14d82..b4bb469 100644 --- a/hercules.spec +++ b/hercules.spec @@ -1,8 +1,9 @@ Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules Version: 3.13 -Release: 17%{?dist} -License: QPL +Release: 18%{?dist} +# Automatically converted from old format: QPL - review is highly recommended. +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 @@ -99,6 +100,9 @@ rm %{buildroot}%{_libdir}/*.la %changelog +* Wed Aug 07 2024 Miroslav Suchý - 3.13-18 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 3.13-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 537d172d957c133094439e47d8245eecb40faa76 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 1 Jan 2025 14:42:16 -0800 Subject: [PATCH 14/21] 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 15/21] 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 16/21] 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 17/21] 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 18/21] 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 19/21] 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 20/21] 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 21/21] 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