From 8d5132e85a6cdf7b18f43c4dcff3c934170ddc2c Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 14 Jul 2025 12:42:50 +0200
Subject: [PATCH] 4.15.7 (fedora#2379508)

---
 .gitignore       |  1 +
 a2ps-gcc15.patch | 42 ------------------------------------------
 a2ps.spec        | 11 +++++------
 sources          |  2 +-
 4 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 a2ps-gcc15.patch

diff --git a/.gitignore b/.gitignore
index 2c71345..850f52d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ a2ps-4.14.tar.gz
 i18n-fonts-0.1.tar.gz
 /a2ps-4.15.5.tar.gz
 /a2ps-4.15.6.tar.gz
+/a2ps-4.15.7.tar.gz
diff --git a/a2ps-gcc15.patch b/a2ps-gcc15.patch
deleted file mode 100644
index 52b40bc..0000000
--- a/a2ps-gcc15.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/liba2ps/parseppd.y b/liba2ps/parseppd.y
-index df4d863..ab24a78 100644
---- a/liba2ps/parseppd.y
-+++ b/liba2ps/parseppd.y
-@@ -39,6 +39,7 @@
- #include "message.h"
- #include "routines.h"
- #include "lexppd.h"
-+#include "parseppd.h"
- 
- #define YYDEBUG 1
- #define YYERROR_VERBOSE 1
-@@ -50,7 +51,7 @@ extern struct a2ps_job * job;
- 
- /* Local prototypes */
- void yyerror (const char *msg);
--static void yyprint ();
-+static void yyprint (FILE *file, int type, YYSTYPE value);
- 
- /* Initilizes the obstacks */
- void ppdlex_initialize (void);
-diff --git a/src/parsessh.y b/src/parsessh.y
-index 0a151c7..395d7f5 100644
---- a/src/parsessh.y
-+++ b/src/parsessh.y
-@@ -39,6 +39,7 @@
- #include "message.h"
- #include "routines.h"
- #include "yy2ssh.h"
-+#include "parsessh.h"
- 
- #define YYDEBUG 1
- #define YYERROR_VERBOSE 1
-@@ -63,7 +64,7 @@ extern const char * sshfilename;
- 
- /* Local prototypes */
- void yyerror (const char *msg);
--static void yyprint ();
-+static void yyprint (FILE *file, int type, YYSTYPE value);
- 
- /* Initilizes the obstacks */
- void sshlex_initialize (void);
diff --git a/a2ps.spec b/a2ps.spec
index 9175791..cfed4c4 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript
 Name: a2ps
-Version: 4.15.6
-Release: 3%{?dist}
+Version: 4.15.7
+Release: 1%{?dist}
 # several files in afm/, lib/, liba2ps/, src/ - GPL3+
 # gnulib files in lib/ - LGPL-2.1+
 # several files in lib/ - LGPL-3+
@@ -37,8 +37,6 @@ Patch17: a2ps-forward-null.patch
 Patch18: a2ps-overrun-dynamic.patch
 Patch19: a2ps-overrun-static.patch
 Patch20: a2ps-resource-leak.patch
-# https://savannah.gnu.org/bugs/index.php?66678
-Patch21: a2ps-gcc15.patch
 
 
 # most conversion rules are guarded by configure macros, so they
@@ -191,8 +189,6 @@ and medias.
 %patch -P 19 -p1 -b .overrun-static
 # Coverity fix (resource-leak).
 %patch -P 20 -p1 -b .resource-leak
-# https://savannah.gnu.org/bugs/index.php?66678
-%patch -P 21 -p1 -b .gcc15
 
 for file in AUTHORS ChangeLog; do
   iconv -f latin1 -t UTF-8 < $file > $file.utf8
@@ -321,6 +317,9 @@ exit 0
 %{_mandir}/man1/pdiff.1.gz
 
 %changelog
+* Mon Jul 14 2025 Zdenek Dohnal <zdohnal@redhat.com> - 4.15.7-1
+- 4.15.7 (fedora#2379508)
+
 * Fri Jan 17 2025 Zdenek Dohnal <zdohnal@redhat.com> - 4.15.6-3
 - fix build with GCC 15 (fedora#2336012)
 
diff --git a/sources b/sources
index dd0498c..510d6ee 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (a2ps-4.15.6.tar.gz) = 23d054a2e58c28460c5e23a1cf3f0f9c27faffc9a99781c42c11cc0693eea5bb8cfe090a97b9bae3d80cfae6b4d5b9a30dfd997a2d70be2d25988c714ad14b44
+SHA512 (a2ps-4.15.7.tar.gz) = 9ae73d29f9504cb6a9b85cd896286551fc7f65c0abba9a6e7ba1bd0a1f99b58e206b5a1dde42fa8eecc01a5ce32cdc16aafe4ca1a4eb5c5b01e48d816903269a
 SHA512 (i18n-fonts-0.1.tar.gz) = 670853cd0acc5feca572c1b0969d8fd506d2cdee0114d41d0a615f994455bd8ce122bfb02d92b85d18ddd9daa7174b86ccb3fdab92c1769aab066cbc62811fde