- updated to 4.2ga10

2023-05-30 12:44:30 +02:00
4 changed files with 8 additions and 114 deletions
--- a/c23.patch
+++ b/c23.patch
@ -1,21 +0,0 @@
-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
- #define XtInheritUnhighlight XtInheritHighlight
- #define XtInheritNotify      XtInheritHighlight
- 
--- a/mkversion.patch
+++ b/mkversion.patch
@ -1,12 +0,0 @@
-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.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')
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (suite3270-4.5ga5-src.tgz) = 4d80f4d31b88a5d99862b6a2c0fbb6c4f45ea55d393d306cd0cb7e989a85759da7df5afcda1ba24e6608ab9a61a5385d8d63786b5e83c6ba192d1b682546d02e
+SHA512 (suite3270-4.2ga10-src.tgz) = fc848760263359fd844c4cd8b51e4f3829d000a66efce7064cb32d0e82d8ba4346031d561c4311733a447931a75942d06083772191143a68c6c4f4a2c231ac96
--- a/x3270.spec
+++ b/x3270.spec
@ -1,19 +1,16 @@
 %global catalogue /etc/X11/fontpath.d

-%global majorver 4.5
+%global majorver 4.2
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
-Version: 4.5ga5
-Release: 3%{?dist}
-License: BSD-3-Clause AND HPND-sell-variant AND MIT AND Apache-2.0
+Version: 4.2ga10
+Release: 1%{?dist}
+License: BSD
 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
-Patch2: mkversion.patch

 BuildRequires: make
 BuildRequires: ncurses-devel
@ -28,7 +25,6 @@ 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
@ -65,7 +61,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 --disable-tcl3270 --disable-b3270 --enable-playback
+%configure --enable-x3270 --enable-c3270 --enable-s3270 --enable-pr3287 --enable-playback
 make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS" LIBX3270DIR=%{_sysconfdir}


@ -92,7 +88,6 @@ desktop-file-install \
 %doc README.md
 %{_bindir}/s3270
 %{_bindir}/pr3287
-%{_bindir}/prtodir
 %{_bindir}/x3270if
 %{_bindir}/playback
 %{_mandir}/man1/s3270.1*
@ -117,76 +112,8 @@ desktop-file-install \


 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.5ga5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 4.5ga5-2
- Rebuilt for openssl 4.0
-
-* Mon Feb 23 2026 Dan Horák <dan[at]danny.cz> - 4.5ga5-1
- updated to 4.5ga5(rhbz#2368663)
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.4ga6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Sun Nov 16 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 4.4ga6-3
- Add xrdb dependency
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.4ga6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed May 7 2025 Jakub Čajka <jcajka@redhat.com> 4.4ga6-1
- updated to 4.4ga6(rhbz#2362329)
-
-* Fri Mar 28 2025 Jakub Čajka <jcajka@redhat.com> 4.4ga5-1
- updated to 4.4ga5(rhbz#2344000)
-
-* Mon Jan 27 2025 Jakub Čajka <jcajka@redhat.com> 4.4alpha1-1
- updated to 4.4alpha1(rhbz#2332509)
- workaround C23 related issues(rhbz#2341559)
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3ga8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3ga8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Apr 08 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga8-1
- updated to 4.3ga8(rhbz#2272416)
-
-* Mon Mar 25 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga7-1
- updated to 4.3ga7(rhbz#2270739)
-
-* Tue Mar 05 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga6-1
- updated to 4.3ga6(#2267465)
-
-* Mon Feb 19 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga5-1
- updated to 4.3ga5(#2264784)
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3ga4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 16 2023 Jakub Čajka <jcajka@redhat.com> 4.3ga4-1
- updated to 4.3ga4(#2244223)
-
-* Fri Sep 08 2023 Jakub Čajka <jcajka@redhat.com> 4.3ga3-1
- updated to 4.3ga3(#2237932)
-
-* Tue Aug 01 2023 Jakub Čajka <jcajka@redhat.com> 4.3beta1-1
- updated to 4.3beta2(#2227482)
- converted to the SPDX
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3beta1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May 30 2023 Jakub Čajka <jcajka@redhat.com> 4.3beta1-1
- updated to 4.3beta1(#2210893)
-
-* Thu Mar 09 2023 Jakub Čajka <jcajka@redhat.com> 4.2ga9-1
- updated to 4.2ga9 (#2175581)
-
-* Thu Feb 09 2023 Jakub Čajka <jcajka@redhat.com> 4.2ga8-1
- updated to 4.2ga8 (#2165415)
+* Tue May 30 2023 Jakub Čajka <jcajka@redhat.com> 4.2ga10-1
+- updated to 4.2ga10

 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2ga7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild