xdialog-2.3.1-configure-c99.patch

@@ -1,15 +0,0 @@
-diff --git a/configure b/configure
-index e3d753a..6e1864d 100755
---- a/configure
-+++ b/configure
-@@ -5146,8 +5146,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext

xdialog.spec

@@ -3,18 +3,17 @@
 Name: xdialog
 Summary: X11 drop in replacement for cdialog
 Version: 2.3.1
-Release: 42%{?dist}
-License: GPL-1.0-or-later
+Release: 23%{?dist}
+License: GPL+
 URL: http://xdialog.free.fr
 
 Source0: http://xdialog.free.fr/%{real_name}-%{version}.tar.bz2
 Patch0: xdialog-2.3.1-nostrip.patch
 # RHBZ #1037393: Fixes a format string vulnerability (via argv[0])
 Patch1: xdialog-2.3.1-secure-fprintf.diff
-Patch2: xdialog-2.3.1-configure-c99.patch
 
-BuildRequires: make
-BuildRequires: gcc
+BuildRequires:  gcc
+BuildRequires: gtk+-devel >= 1.2.0
 BuildRequires: gtk2-devel >= 2.2.0
 BuildRequires: gettext
 
@@ -35,22 +34,26 @@ range box, and much more).
 iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8
 touch -c -r ChangeLog ChangeLog.utf8
 mv ChangeLog.utf8 ChangeLog
-%patch -P0 -p1 -b .nostrip
-%patch -P1 -p0 -b .fprintf
-%patch -P2 -p1 -b .configure
+%patch0 -p1 -b .nostrip
+%patch1 -p0 -b .fprintf
 touch -c -r configure.nostrip configure
 touch -c -r configure.in.nostrip configure.in
 
 %build
-# build only the gtk2 version. Upstream advises not to use
-# the gtk2 version, however the issues with gtk2 version is with non UTF-8
+# build both the gtk1 and gtk2 versions. Upstream advises not to use 
+# the gtk2 version, however the issues with gtk2 version is with non UTF-8 
 # locales which should be rare on fedora, and gtk2 has more features.
+%configure
+make %{?_smp_mflags}
+mv src/Xdialog src/Xdialog-gtk1
+make clean
 %configure --with-gtk2
-%make_build
+make %{?_smp_mflags}
 sed -i -e 's:%{_datadir}/doc/Xdialog:%{_datadir}/doc/%{name}:g' doc/Xdialog.1
 
 %install
-%make_install
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+install -m0755 src/Xdialog-gtk1 %{buildroot}%{_bindir}
 
 rm -rf __dist_html
 mkdir -p __dist_html/html
@@ -67,66 +70,10 @@ ln -s ../samples __dist_html/html/samples
 %license COPYING
 %{_mandir}/man1/Xdialog.1*
 %{_bindir}/Xdialog
+%{_bindir}/Xdialog-gtk1
 %exclude %{_docdir}/%{real_name}-%{version}
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-42
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-41
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-40
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-38
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jun 17 2024 Miroslav Suchý <msuchy@redhat.com> - 2.3.1-37
-- convert license to SPDX
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-36
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Dec 22 2022 Peter Fordham <peter.fordham@gmail.com> - 2.3.1-33
-- Port configure script to C99.
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sun Mar 13 2022 Sérgio Basto <sergio@serjux.com> - 2.3.1-31
-- Drop build on gtk+ (Let's retire original glib and gtk+)
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild