[rpms/wdiff] f45: Update to 1.2.3 (close RHBZ#2514931)

[rpms/wdiff] f45: Update to 1.2.3 (close RHBZ#2514931)

[Benjamin A. Beasley]

            A new commit has been pushed.

            Repo   : rpms/wdiff
            Branch : f45
            Commit : d6c1a774db661d01195612b34f01357ec195cd79
            Author : Benjamin A. Beasley <code@musicinmybrain.net>
            Date   : 2026-08-13T21:51:15+01:00
            Stats  : +116/-38 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/wdiff/c/d6c1a774db661d01195612b34f01357ec195cd79?branch=f45

            Log:
            Update to 1.2.3 (close RHBZ#2514931)

- Improve License expression and add SourceLicense

---
diff --git a/.gitignore b/.gitignore
index a8dca34..62b0a82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 /wdiff-1.2.1.tar.gz
 /wdiff-1.2.2.tar.gz
 /wdiff-1.2.2.tar.gz.sig
+/wdiff-1.2.3.tar.gz
+/wdiff-1.2.3.tar.gz.sig
+/gnu-keyring.gpg

diff --git a/gnu-keyring.gpg b/gnu-keyring.gpg
deleted file mode 100644
index 8f4e2bc..0000000
Binary files a/gnu-keyring.gpg and /dev/null differ

diff --git a/sources b/sources
index 7f3e0eb..4a1d142 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (wdiff-1.2.2.tar.gz) = 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-SHA512 (wdiff-1.2.2.tar.gz.sig) = 72db186b8d4ac1c81bdfb790cf08e82fd994938290f383756c683e68d0f4371c961f8e0b935b0cb1cc3947d4820b9d7a3e6f91a61e0570c9468d7da29d14ec7f
+SHA512 (wdiff-1.2.3.tar.gz) = 5a5b004fe6fc4fdd90f85ddbc5b751b682224da83efc5fe90fbe7cdb0bc0f0e0fdd0e25c5e70223d738c280bb537cb88dee29599d1c33d9d10c491f56034a06d
+SHA512 (wdiff-1.2.3.tar.gz.sig) = 6e8da9844734728cd38081a26af1a04d8881ef95a52263af308b442888985a6bf6ff1e7265deca41b6897f567173ea89836f73b002e0bb623284870bf7a69ffe
+SHA512 (gnu-keyring.gpg) = 0860d845851d2216b7c99bfe9c8aa5c1883f5ec54153c40daba5295db46bc7a4fb15fb8954d8675324255a0c67e77589e83a13c9f70f9aac81fbf55a32231c85

diff --git a/wdiff-1.2.2-c23.patch b/wdiff-1.2.2-c23.patch
deleted file mode 100644
index 8c695e5..0000000
--- a/wdiff-1.2.2-c23.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wdiff-1.2.2-original/src/mdiff.c wdiff-1.2.2/src/mdiff.c
---- wdiff-1.2.2-original/src/mdiff.c	2014-04-14 16:05:53.000000000 -0400
-+++ wdiff-1.2.2/src/mdiff.c	2025-01-21 12:49:15.668209919 -0500
-@@ -53,8 +53,6 @@
- #include <ctype.h>
- #include <string.h>
- 
--char *strstr ();
--
- #if HAVE_TPUTS
- # if HAVE_TERMCAP_H
- #  include <termcap.h>

diff --git a/wdiff.spec b/wdiff.spec
index 9500a27..5fe3f1f 100644
--- a/wdiff.spec
+++ b/wdiff.spec
@@ -1,31 +1,123 @@
 %bcond rebuild_mans 1
+# As of 1.2.3, cannot autoreconf due to:
+# configure:14538: error: undefined or overquoted macro: gl_PTHREADLIB
+# configure:14651: error: undefined or overquoted macro: gl_WEAK_SYMBOLS
+# configure:15859: error: undefined or overquoted macro: gl_TYPE_WINT_T_PREREQ
+%bcond autoreconf 0
 
 Name:           wdiff
-Version:        1.2.2
+Version:        1.2.3
 Release:        %autorelease
 Summary:        Compare files on a word per word basis
 
-# Entire source is GPL-3.0-or-later, except wdiff.texi and the documentation
-# built from it, including info, HTML, and PDF documentation, which is Latex2e.
-License:        GPL-3.0-or-later AND Latex2e
-URL:            https://www.gnu.org/software/wdiff/
+# Entire source is GPL-3.0-or-later, except:
+#
+# Latex2e:
+#   wdiff.texi and the documentation built from it, including info, HTML, and
+#     PDF documentation, to include doc/wdiff.info in the source tree.
+# LGPL-2.0-or-later:
+#     lib/_Noreturn.h
+#     lib/arg-nonnull.h
+#     lib/c++defs.h
+#     lib/warn-on-use.h
+# LGPL-2.1-or-later:
+#   the entire contents of lib/, except:
+#     - those listed as LGPL-2.0-or-later, above
+#     - lib/Makefile.{am,in}, which are build-system files and are documented
+#       above SourceLicense, and
+#     - the following, which are GPL-3.0-or-later:
+#       lib/xalloc-die.c lib/xalloc.h lib/xmalloc.c
+#   lib/*/*.*
+License:        %{shrink:
+    GPL-3.0-or-later AND
+    LGPL-2.0-or-later AND
+    LGPL-2.1-or-later AND
+    Latex2e
+    }
+# Additionally, build-system files do not contribute to the licenses of the
+# binary RPMs, and some of these are under other licenses:
+#
+# FSFAP:
+#   AUTHORS
+#   config.h.in (inasmuch as it is derived from configure.ac, which is
+#     explicitly so licensed)
+#   configure.ac
+#   INSTALL
+#   Makefile.am
+#   README
+#   THANKS
+#   TODO
+#   doc/Makefile.am
+#   man/Makefile.am
+#   po/POTFILES.in
+#   src/Makefile.am
+# FSFAP AND FSFULLRWD: (Each is documented as FSFULLRWD, but derived from a
+#     corresponding Makefile.am that is FSFAP.)
+#   Makefile.in
+#   doc/Makefile.in
+#   man/Makefile.in
+#   src/Makefile.in
+# FSFAP-no-warranty-disclaimer:
+#   configure
+#   build-aux/config.rpath
+# FSFUL:
+#   tests/testsuite
+# FSFULLR AND FSFULLRWD:
+#   aclocal.m4
+# FSFULLRWD AND GPL-3.0-or-later WITH Autoconf-exception-generic:
+#   lib/Makefile.in
+# FSFULLRWD:
+#   m4/*, except:
+#     - m4/gnulib-cache.m4
+#     - m4/gnulib-comp.m4
+#     - m4/init-package-version.m4
+# GPL-2.0-or-later:
+#   build-aux/gnupload
+# GPL-2.0-or-later WITH Autoconf-exception-generic:
+#   build-aux/compile
+#   build-aux/depcomp
+#   build-aux/mdate-sh
+#   build-aux/missing
+#   m4/init-package-version.m4
+# GPL-3.0-or-later WITH Autoconf-exception-generic:
+#   lib/Makefile.am
+#   m4/gnulib-cache.m4
+#   m4/gnulib-comp.m4
+# GPL-3.0-or-later WITH Autoconf-exception-generic-3.0:
+#   build-aux/config.guess
+#   build-aux/config.sub
+# GPL-3.0-or-later WITH Texinfo-exception:
+#   build-aux/texinfo.tex
+# X11 AND LicenseRef-Fedora-Public-Domain:
+#   build-aux/install (“FSF changes to this file are in the public domain.”)
+SourceLicense:  %{shrink:
+    %{license} AND
+    FSFAP AND
+    FSFAP-no-warranty-disclaimer AND
+    FSFUL AND
+    FSFULLR AND
+    FSFULLRWD AND
+    GPL-2.0-or-later AND
+    GPL-2.0-or-later WITH Autoconf-exception-generic AND
+    GPL-3.0-or-later WITH Autoconf-exception-generic AND
+    GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND
+    GPL-3.0-or-later WITH Texinfo-exception AND
+    LicenseRef-Fedora-Public-Domain AND
+    X11
+    }
+URL:            https://www.gnu.org/software/wdiff
 Source0:        https://ftp.gnu.org/gnu/wdiff/wdiff-%{version}.tar.gz
 Source1:        https://ftp.gnu.org/gnu/wdiff/wdiff-%{version}.tar.gz.sig
+# Fetched 2026-08-13:
 Source2:        https://ftp.gnu.org/gnu/gnu-keyring.gpg
 
-# Fails to build with GCC 15 in default C23 mode
-# https://savannah.gnu.org/bugs/index.php?66692
-#
-# The redeclaration of strstr() is unnecessary since it is part of C89 and
-# later and we won’t need the gnulib replacement, so we patch out the
-# redeclaration rather than fixing its signature.
-Patch:          wdiff-1.2.2-c23.patch
-
 BuildRequires:  gcc
 BuildRequires:  make
+%if %{with autoreconf}
 BuildRequires:  automake
 BuildRequires:  autoconf
 BuildRequires:  libtool  
+%endif
 
 BuildRequires:  gettext-devel
 BuildRequires:  ncurses-devel
@@ -37,8 +129,9 @@ BuildRequires:  tex(latex)
 
 BuildRequires:  gpgverify
 
-#https://fedorahosted.org/fpc/ticket/174
-Provides: bundled(gnulib) = 30.5.2012
+# https://fedorahosted.org/fpc/ticket/174
+# Unclear which version of gnulib is currently bundled.
+Provides: bundled(gnulib)
 
 %description
 The GNU wdiff program is a front end to diff for comparing files on a word per
@@ -53,18 +146,11 @@ produce a nicer display of word differences between the original files.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
-# Fix ISO-8859-1-encoded files
-for fn in BACKLOG ChangeLog
-do
-  iconv --from=ISO-8859-1 --to=UTF-8 "${fn}" > "${fn}.iconv"
-  touch --reference="${fn}" "${fn}.iconv"
-  chmod --verbose --reference="${fn}" "${fn}.iconv"
-  mv --force "${fn}.iconv" "${fn}"
-done
-
 
 %conf
+%if %{with autoreconf}
 autoreconf --force --install --verbose
+%endif
 %configure --enable-experimental="mdiff wdiff2 unify"