From 314e560ab12f9d70e0771ea34267038c8b41ec69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:22:47 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- x3270.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x3270.spec b/x3270.spec index c8d18c4..c91d86c 100644 --- a/x3270.spec +++ b/x3270.spec @@ -4,7 +4,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 4.3ga8 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz @@ -113,6 +113,9 @@ desktop-file-install \ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.3ga8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 4.3ga8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From dabefc2dd1911abb3d3934c41d688e561e5ca127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 28 Jan 2025 15:41:40 +0100 Subject: [PATCH 02/10] - updated to 4.4alpha1(rhbz#2332509) - workaround C23 related issues(rhbz#2341559) --- c23.patch | 14 ++++++++++++++ sources | 2 +- x3270.spec | 12 +++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 c23.patch diff --git a/c23.patch b/c23.patch new file mode 100644 index 0000000..242c799 --- /dev/null +++ b/c23.patch @@ -0,0 +1,14 @@ +diff -up suite3270-4.4/x3270/CmeP.h.void suite3270-4.4/x3270/CmeP.h +--- suite3270-4.4/x3270/CmeP.h.void 2025-01-23 10:20:17.270008858 +0100 ++++ suite3270-4.4/x3270/CmeP.h 2025-01-28 15:20:07.496211002 +0100 +@@ -120,9 +120,7 @@ typedef struct _CmeRec { + * + ************************************************************/ + +-typedef void (*_XawEntryVoidFunc)(); +- +-#define XtInheritHighlight ((_XawEntryVoidFunc) _XtInherit) ++#define XtInheritHighlight (void (*)(struct _WidgetRec *)) _XtInherit + #define XtInheritUnhighlight XtInheritHighlight + #define XtInheritNotify XtInheritHighlight + diff --git a/sources b/sources index d55d866..4a495f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suite3270-4.3ga8-src.tgz) = 3ee75ca2a4681e90226b9287f05deda51ee88e5262809cd008d732b2ccc952c7312dd1f42e6d1eb793ada459d69fa206a5f89b4add2afc953eb4897c89bc9744 +SHA512 (suite3270-4.4alpha1-src.tgz) = e4c6e0f21459828301e0481f48c5e6f17f6d792f98e9b94691130699b743ff2a8a71d5d34e0d8b3114b6ee6f9700c1c23f4cab3389f2cd67aa4ef09cac63a7d6 diff --git a/x3270.spec b/x3270.spec index c91d86c..10d3854 100644 --- a/x3270.spec +++ b/x3270.spec @@ -1,16 +1,18 @@ %global catalogue /etc/X11/fontpath.d -%global majorver 4.3 +%global majorver 4.4 Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 4.3ga8 -Release: 3%{?dist} +Version: 4.4alpha1 +Release: 1%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz Source1: x3270.png Source2: x3270.desktop Patch0: x3270-3.5-paths.patch +# workaround C23 related issues +Patch1: c23.patch BuildRequires: make BuildRequires: ncurses-devel @@ -113,6 +115,10 @@ desktop-file-install \ %changelog +* Mon Jan 27 2025 Jakub Čajka 4.4alpha1-1 +- updated to 4.4alpha1(rhbz#2332509) +- workaround C23 related issues(rhbz#2341559) + * Sun Jan 19 2025 Fedora Release Engineering - 4.3ga8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4fc8951bf8ea0298a27d5d32b904bc03ba856ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Fri, 28 Mar 2025 12:17:48 +0100 Subject: [PATCH 03/10] Update to 4.4ga5 --- mkversion.patch | 19 +++++++++++++++++++ sources | 2 +- x3270.spec | 6 +++++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 mkversion.patch diff --git a/mkversion.patch b/mkversion.patch new file mode 100644 index 0000000..1997b0c --- /dev/null +++ b/mkversion.patch @@ -0,0 +1,19 @@ +diff -up suite3270-4.4/Common/mkversion.py.pp suite3270-4.4/Common/mkversion.py +--- suite3270-4.4/Common/mkversion.py.pp 2025-03-28 11:10:48.167336041 +0100 ++++ suite3270-4.4/Common/mkversion.py 2025-03-28 11:11:41.308098450 +0100 +@@ -111,7 +111,7 @@ def mkversion(outfile_name: str, program + + # Get the date. + if 'SOURCE_DATE_EPOCH' in os.environ: +- now = datetime.strptime(os.environ['SOURCE_DATE_EPOCH'], '%a %b %d %H:%M:%S %Z %Y').replace(tzinfo=timezone.utc) ++ now = datetime.utcfromtimestamp(int(os.environ['SOURCE_DATE_EPOCH'])) + else: + now = datetime.now(timezone.utc) + builddate = datetime.strftime(now, '%a %b %d %H:%M:%S %Z %Y') +@@ -169,4 +169,4 @@ if len(args) > 1: + version_txt = args[1] + + # Run. +-mkversion(outfile_name, program, version_txt) +\ No newline at end of file ++mkversion(outfile_name, program, version_txt) diff --git a/sources b/sources index 4a495f9..35d4a25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suite3270-4.4alpha1-src.tgz) = e4c6e0f21459828301e0481f48c5e6f17f6d792f98e9b94691130699b743ff2a8a71d5d34e0d8b3114b6ee6f9700c1c23f4cab3389f2cd67aa4ef09cac63a7d6 +SHA512 (suite3270-4.4ga5-src.tgz) = 091964f1757f1bbe257160cbd56edda564637df3083fa79948d819b217f08c0a547c867067a4153c275f21e50ce9b51df09663e042dc4a7aaf6286742f58fa9b diff --git a/x3270.spec b/x3270.spec index 10d3854..bb757c4 100644 --- a/x3270.spec +++ b/x3270.spec @@ -3,7 +3,7 @@ %global majorver 4.4 Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 4.4alpha1 +Version: 4.4ga5 Release: 1%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page @@ -13,6 +13,7 @@ Source2: x3270.desktop Patch0: x3270-3.5-paths.patch # workaround C23 related issues Patch1: c23.patch +Patch2: mkversion.patch BuildRequires: make BuildRequires: ncurses-devel @@ -115,6 +116,9 @@ desktop-file-install \ %changelog +* Fri Mar 28 2025 Jakub Čajka 4.4ga5-1 +- updated to 4.4ga5(rhbz#2344000) + * Mon Jan 27 2025 Jakub Čajka 4.4alpha1-1 - updated to 4.4alpha1(rhbz#2332509) - workaround C23 related issues(rhbz#2341559) From c065f4e39385c1ceceed5f1fceb88644c8efe6cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Wed, 7 May 2025 13:09:54 +0200 Subject: [PATCH 04/10] updated to 4.4ga6(rhbz#2362329) --- sources | 2 +- x3270.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 35d4a25..c65d5de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suite3270-4.4ga5-src.tgz) = 091964f1757f1bbe257160cbd56edda564637df3083fa79948d819b217f08c0a547c867067a4153c275f21e50ce9b51df09663e042dc4a7aaf6286742f58fa9b +SHA512 (suite3270-4.4ga6-src.tgz) = 5709fdb97057ceeb0b8fcc67153a8eeee1943595df7a2aeed48b9db43c067a2107df3bbe8fcf6e9a12b2d1d23d6ec7cd522dcbc974eef7419d59593199782321 diff --git a/x3270.spec b/x3270.spec index bb757c4..4c7f0b0 100644 --- a/x3270.spec +++ b/x3270.spec @@ -3,7 +3,7 @@ %global majorver 4.4 Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 4.4ga5 +Version: 4.4ga6 Release: 1%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page @@ -116,6 +116,9 @@ desktop-file-install \ %changelog +* Wed May 7 2025 Jakub Čajka 4.4ga6-1 +- updated to 4.4ga6(rhbz#2362329) + * Fri Mar 28 2025 Jakub Čajka 4.4ga5-1 - updated to 4.4ga5(rhbz#2344000) From 522581b7d10cec2fa8c1cd3b8f19d1ec6280bb11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:36:17 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- x3270.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x3270.spec b/x3270.spec index 4c7f0b0..1b26b4f 100644 --- a/x3270.spec +++ b/x3270.spec @@ -4,7 +4,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 4.4ga6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz @@ -116,6 +116,9 @@ desktop-file-install \ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.4ga6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed May 7 2025 Jakub Čajka 4.4ga6-1 - updated to 4.4ga6(rhbz#2362329) From 43c33ace12fcb438fd7a073d085de5b9bd03165a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 16 Nov 2025 16:28:12 -0500 Subject: [PATCH 06/10] x3270-x11 Requires: xrdb x3270a calls xrdb to determine the font DPI. https://gitlab.com/redhat/centos-stream/rpms/x3270/-/commit/ec8aa0531b88f1fc99a4ec0e22578c15551b61f8 --- x3270.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x3270.spec b/x3270.spec index 1b26b4f..87ea7a6 100644 --- a/x3270.spec +++ b/x3270.spec @@ -4,7 +4,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 4.4ga6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz @@ -28,6 +28,7 @@ Summary: IBM 3278/3279 terminal emulator for the X Window System BuildRequires: mkfontdir bdftopcf BuildRequires: libXaw-devel Requires: %{name} = %{version} +Requires: xrdb %package text Summary: IBM 3278/3279 terminal emulator for text mode @@ -116,6 +117,9 @@ desktop-file-install \ %changelog +* Sun Nov 16 2025 Yaakov Selkowitz - 4.4ga6-3 +- Add xrdb dependency + * Fri Jul 25 2025 Fedora Release Engineering - 4.4ga6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9bbd94e69cae99364859f07ffc2664a05e887ff0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:25:55 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- x3270.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x3270.spec b/x3270.spec index 87ea7a6..fbb6bc3 100644 --- a/x3270.spec +++ b/x3270.spec @@ -4,7 +4,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 4.4ga6 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz @@ -117,6 +117,9 @@ desktop-file-install \ %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 4.4ga6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sun Nov 16 2025 Yaakov Selkowitz - 4.4ga6-3 - Add xrdb dependency From e02f348cf97e69efc08041815c2694a6f3701f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 23 Feb 2026 17:38:42 +0100 Subject: [PATCH 08/10] - updated to 4.5ga5(rhbz#2368663) --- c23.patch | 15 +++++++++++---- mkversion.patch | 15 ++++----------- sources | 2 +- x3270.spec | 11 +++++++---- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/c23.patch b/c23.patch index 242c799..3ccd25e 100644 --- a/c23.patch +++ b/c23.patch @@ -1,11 +1,18 @@ -diff -up suite3270-4.4/x3270/CmeP.h.void suite3270-4.4/x3270/CmeP.h ---- suite3270-4.4/x3270/CmeP.h.void 2025-01-23 10:20:17.270008858 +0100 -+++ suite3270-4.4/x3270/CmeP.h 2025-01-28 15:20:07.496211002 +0100 -@@ -120,9 +120,7 @@ typedef struct _CmeRec { +diff -up suite3270-4.5/x3270/CmeP.h.c23 suite3270-4.5/x3270/CmeP.h +--- suite3270-4.5/x3270/CmeP.h.c23 2026-02-23 17:11:47.532461550 +0100 ++++ suite3270-4.5/x3270/CmeP.h 2026-02-23 17:12:44.818297155 +0100 +@@ -120,16 +120,7 @@ typedef struct _CmeRec { * ************************************************************/ +-#if defined(__clang__) /*[*/ +-# pragma clang diagnostic push +-# pragma clang diagnostic ignored "-Wstrict-prototypes" +-#endif /*]*/ -typedef void (*_XawEntryVoidFunc)(); +-#if defined(__clang__) /*[*/ +-# pragma clang diagnostic pop +-#endif /*]*/ - -#define XtInheritHighlight ((_XawEntryVoidFunc) _XtInherit) +#define XtInheritHighlight (void (*)(struct _WidgetRec *)) _XtInherit diff --git a/mkversion.patch b/mkversion.patch index 1997b0c..7da52f2 100644 --- a/mkversion.patch +++ b/mkversion.patch @@ -1,19 +1,12 @@ -diff -up suite3270-4.4/Common/mkversion.py.pp suite3270-4.4/Common/mkversion.py ---- suite3270-4.4/Common/mkversion.py.pp 2025-03-28 11:10:48.167336041 +0100 -+++ suite3270-4.4/Common/mkversion.py 2025-03-28 11:11:41.308098450 +0100 +diff -up suite3270-4.5/Common/mkversion.py.orig suite3270-4.5/Common/mkversion.py +--- suite3270-4.5/Common/mkversion.py.orig 2026-02-23 17:23:54.155112220 +0100 ++++ suite3270-4.5/Common/mkversion.py 2026-02-23 17:24:19.943983520 +0100 @@ -111,7 +111,7 @@ def mkversion(outfile_name: str, program # Get the date. if 'SOURCE_DATE_EPOCH' in os.environ: -- now = datetime.strptime(os.environ['SOURCE_DATE_EPOCH'], '%a %b %d %H:%M:%S %Z %Y').replace(tzinfo=timezone.utc) +- now = datetime.fromtimestamp(int(os.environ['SOURCE_DATE_EPOCH'])).replace(tzinfo=timezone.utc) + now = datetime.utcfromtimestamp(int(os.environ['SOURCE_DATE_EPOCH'])) else: now = datetime.now(timezone.utc) builddate = datetime.strftime(now, '%a %b %d %H:%M:%S %Z %Y') -@@ -169,4 +169,4 @@ if len(args) > 1: - version_txt = args[1] - - # Run. --mkversion(outfile_name, program, version_txt) -\ No newline at end of file -+mkversion(outfile_name, program, version_txt) diff --git a/sources b/sources index c65d5de..0a961b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suite3270-4.4ga6-src.tgz) = 5709fdb97057ceeb0b8fcc67153a8eeee1943595df7a2aeed48b9db43c067a2107df3bbe8fcf6e9a12b2d1d23d6ec7cd522dcbc974eef7419d59593199782321 +SHA512 (suite3270-4.5ga5-src.tgz) = 4d80f4d31b88a5d99862b6a2c0fbb6c4f45ea55d393d306cd0cb7e989a85759da7df5afcda1ba24e6608ab9a61a5385d8d63786b5e83c6ba192d1b682546d02e diff --git a/x3270.spec b/x3270.spec index fbb6bc3..b7e55c3 100644 --- a/x3270.spec +++ b/x3270.spec @@ -1,10 +1,10 @@ %global catalogue /etc/X11/fontpath.d -%global majorver 4.4 +%global majorver 4.5 Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 4.4ga6 -Release: 4%{?dist} +Version: 4.5ga5 +Release: 1%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz @@ -65,7 +65,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM %build -%configure --enable-x3270 --enable-c3270 --enable-s3270 --enable-pr3287 --enable-playback +%configure --enable-x3270 --enable-c3270 --enable-s3270 --enable-pr3287 --disable-tcl3270 --disable-b3270 --enable-playback make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS" LIBX3270DIR=%{_sysconfdir} @@ -117,6 +117,9 @@ desktop-file-install \ %changelog +* Mon Feb 23 2026 Dan Horák - 4.5ga5-1 +- updated to 4.5ga5(rhbz#2368663) + * Sat Jan 17 2026 Fedora Release Engineering - 4.4ga6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From af195156d14d68eb8c5cce65bdbedfdd6fc1ee44 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:06:48 -0400 Subject: [PATCH 09/10] Rebuilt for openssl 4.0 --- x3270.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x3270.spec b/x3270.spec index b7e55c3..db6d9ed 100644 --- a/x3270.spec +++ b/x3270.spec @@ -4,7 +4,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 4.5ga5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz @@ -117,6 +117,9 @@ desktop-file-install \ %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 4.5ga5-2 +- Rebuilt for openssl 4.0 + * Mon Feb 23 2026 Dan Horák - 4.5ga5-1 - updated to 4.5ga5(rhbz#2368663) From 8c14d61807d8cd7fe21800735a67aa340738ecdf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:59:28 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- x3270.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x3270.spec b/x3270.spec index db6d9ed..d8ee587 100644 --- a/x3270.spec +++ b/x3270.spec @@ -4,7 +4,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 4.5ga5 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0 URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz @@ -117,6 +117,9 @@ desktop-file-install \ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.5ga5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jun 13 2026 Yaakov Selkowitz - 4.5ga5-2 - Rebuilt for openssl 4.0