setserial-c99.patch

@@ -1,28 +0,0 @@
-Avoid implicit int and implicit function declarations.
-
-A mostly equivalent patch has been posted upstream:
-
-<https://sourceforge.net/p/setserial/discussion/7060/thread/95d874c12c/?limit=25#1643>
-
-diff --git a/setserial.c b/setserial.c
-index f184e98db07ceb59..d181327fc568ede4 100644
---- a/setserial.c
-+++ b/setserial.c
-@@ -15,6 +15,9 @@
- #include <termios.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/ioctl.h>
-+#include <unistd.h>
-+#include <stdlib.h>
- 
- #ifdef HAVE_ASM_IOCTLS_H
- #include <asm/ioctls.h>
-@@ -714,6 +717,7 @@ fprintf(stderr, "\t* port\t\tset the I/O port\n");
- 	exit(1);
- }
- 
-+int
- main(int argc, char **argv)
- {
- 	int	get_flag = 0, wild_intr_flag = 0;

setserial-configure-c99.patch

@@ -1,17 +0,0 @@
-This fixes a generic C99 compatibility issue in autoconf-generated
-code.  No need to upstream this because the issue goes away if
-autoconf is re-run.
-
-diff --git a/configure b/configure
-index 9d6084aa38e5d6e8..4d948816e1112d13 100755
---- a/configure
-+++ b/configure
-@@ -689,7 +689,7 @@ cat > conftest.$ac_ext << EOF
- #line 690 "configure"
- #include "confdefs.h"
- 
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes

setserial.spec

@@ -3,7 +3,7 @@
 Summary: A utility for configuring serial ports
 Name: setserial
 Version: 2.17
-Release: 65%{?dist}
+Release: 54%{?dist}
 Source: https://sourceforge.net/projects/setserial/files/setserial/%{version}/%{name}-%{version}.tar.gz
 Patch0: setserial-2.17-fhs.patch
 Patch1: setserial-2.17-rc.patch
@@ -11,9 +11,7 @@ Patch2: setserial-2.17-readme.patch
 Patch3: setserial-2.17-spelling.patch
 Patch4: setserial-hayesesp.patch
 Patch5: setserial-aarch64.patch
-Patch6: setserial-configure-c99.patch
-Patch7: setserial-c99.patch
-License: GPL-1.0-or-later
+License: GPL+
 URL: http://setserial.sourceforge.net/
 ExcludeArch: s390 s390x
 
@@ -29,25 +27,23 @@ port and IRQ that a particular serial device is using, and more.
 %prep
 %setup -q
 # Use FHS directory layout.
-%patch -P0 -p1 -b .fhs
+%patch0 -p1 -b .fhs
 
 # Fixed initscript.
-%patch -P1 -p1 -b .rc
+%patch1 -p1 -b .rc
 
 # Corrected readme file.
-%patch -P2 -p1 -b .readme
+%patch2 -p1 -b .readme
 
 # Fixed spelling in help output.
-%patch -P3 -p1 -b .spelling
+%patch3 -p1 -b .spelling
 
 # Don't require hayesesp.h (bug #564947).
-%patch -P4 -p1 -b .hayesesp
+%patch4 -p1 -b .hayesesp
 rm -f config.cache
 
 # Support aarch64 (bug #926522).
-%patch -P5 -p1 -b .aarch64
-%patch -P6 -p1
-%patch -P7 -p1
+%patch5 -p1 -b .aarch64
 
 %build
 %set_build_flags
@@ -68,39 +64,6 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-65
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-64
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-63
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-62
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-61
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed May 08 2024 Than Ngo <than@redhat.com> - 2.17-60
-- Migrate to SPDX license
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-59
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-58
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Apr 13 2023 Florian Weimer <fweimer@redhat.com> - 2.17-57
-- Port to C99
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-56
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-55
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-54
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild