From d6df15127a9ab3e4ed1a54963c2e44a9b8cf7ee7 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 29 Nov 2022 14:42:00 -0500 Subject: [PATCH 01/24] Update License to SPDX --- xfontsel.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xfontsel.spec b/xfontsel.spec index b08a210..b50aaba 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -3,7 +3,16 @@ Version: 1.1.0 Release: %autorelease Summary: Tool to list X11 core protocol fonts -License: MIT +# The entire source is X11, except the following files that are not installed +# or belong to the build system and therefore do not contribute to the license +# of the binary RPMs: +# - FSFAP: INSTALL +# - HPND-sell-variant: Makfile.am, Makefile.in, configure.ac +# - FSFULLR: aclocal.m4 +# - GPL-2.0-or-later: compile, depcomp, missing +# - GPL-3.0-or-later: config.guess, config,sub +# - FSFUL, or perhaps (X11 AND HPND-sell-variant): configure +License: X11 URL: https://www.x.org Source0: %{url}/pub/individual/app/%{name}-%{version}.tar.xz Source1: %{url}/pub/individual/app/%{name}-%{version}.tar.xz.sig From bf3572d48625b7347d18188a21517a897d48f522 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:29:44 +0000 Subject: [PATCH 02/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From d973a028d70096ca6b373328b29be06d22d1d308 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 10 Feb 2023 08:52:18 -0500 Subject: [PATCH 03/24] Trivial comment fix in License breakdown --- xfontsel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfontsel.spec b/xfontsel.spec index b50aaba..c819dbb 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -11,7 +11,7 @@ Summary: Tool to list X11 core protocol fonts # - FSFULLR: aclocal.m4 # - GPL-2.0-or-later: compile, depcomp, missing # - GPL-3.0-or-later: config.guess, config,sub -# - FSFUL, or perhaps (X11 AND HPND-sell-variant): configure +# - FSFUL, or perhaps (FSFUL AND X11 AND HPND-sell-variant): configure License: X11 URL: https://www.x.org Source0: %{url}/pub/individual/app/%{name}-%{version}.tar.xz From 818bce9fd4fb08aeb4113400d02d29dbb4a26b18 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 29 May 2023 13:13:42 -0400 Subject: [PATCH 04/24] Reduce macro indirection in the spec file [skip changelog] --- xfontsel.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xfontsel.spec b/xfontsel.spec index c819dbb..d030d1f 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -14,8 +14,8 @@ Summary: Tool to list X11 core protocol fonts # - FSFUL, or perhaps (FSFUL AND X11 AND HPND-sell-variant): configure License: X11 URL: https://www.x.org -Source0: %{url}/pub/individual/app/%{name}-%{version}.tar.xz -Source1: %{url}/pub/individual/app/%{name}-%{version}.tar.xz.sig +Source0: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz +Source1: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz.sig # Keyring created on 2021-02-23 with: # workdir="$(mktemp --directory)" # gpg2 --with-fingerprint xfontsel-1.0.6.tar.bz2.sig 2>&1 | @@ -30,7 +30,7 @@ Source1: %{url}/pub/individual/app/%{name}-%{version}.tar.xz.sig # Since the SKS Keyserver Network is no longer online, you can reproduce by # substituting: # --keyserver=hkps://keys.openpgp.org -Source2: %{name}.gpg +Source2: xfontsel.gpg BuildRequires: gnupg2 @@ -49,7 +49,7 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.8 Obsoletes: xorg-x11-apps < 7.7-31 %description -The %{name} application provides a simple way to display the X11 core protocol +The xfontsel application provides a simple way to display the X11 core protocol fonts known to your X server, examine samples of each, and retrieve the X Logical Font Description (“XLFD”) full name for a font. From a1c8f55ec6576cb4eac34dee4cce8ef5c5eebb49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:52:43 +0000 Subject: [PATCH 05/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f93704b239481692b7d39b6e8b26dbfdfbce162e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:43:21 +0000 Subject: [PATCH 06/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 73a8ad1afd8a9ea88fbec7b81d8f1b6eba3fc555 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:48:56 -0400 Subject: [PATCH 07/24] Stop Obsoleting xorg-x11-apps, which was gone by Fedora 35 --- xfontsel.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xfontsel.spec b/xfontsel.spec index d030d1f..8c29a08 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -46,8 +46,6 @@ BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -Obsoletes: xorg-x11-apps < 7.7-31 - %description The xfontsel application provides a simple way to display the X11 core protocol fonts known to your X server, examine samples of each, and retrieve the X From 60c07ff73bf1d49d1d193fb15ef2eb4d4ab77b1f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 30 Jun 2024 09:51:11 -0400 Subject: [PATCH 08/24] Update to 1.1.1 (close RHBZ#2294797) --- .gitignore | 2 ++ sources | 4 ++-- xfontsel.spec | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 505c1c6..619edff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /xfontsel-1.0.6.tar.bz2.sig /xfontsel-1.1.0.tar.xz /xfontsel-1.1.0.tar.xz.sig +/xfontsel-1.1.1.tar.xz +/xfontsel-1.1.1.tar.xz.sig diff --git a/sources b/sources index 7bbcf40..317584f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xfontsel-1.1.0.tar.xz) = be67d223668431c9b5dd2ef74032d2f087be5f8f0ccc427bc7ee43e7ce42214edddb07d8c3d6d6de93ea35314392d384f1ab1ae5c48b2cfbce418610e3945a52 -SHA512 (xfontsel-1.1.0.tar.xz.sig) = bb04c7bd5e8071d41a34d5b23ec5aa72726ba8e964b94f1bbf28f9d71f2ece11675d94a27a7c984502f0f7da6b1052a9b066c5ee0f61c0aec3871ecef0fd00bc +SHA512 (xfontsel-1.1.1.tar.xz) = fdb1f20dc86e2e74da77ef5e62d9465ea24d1af965f1ff3a6334ffefb239130fcf28f7cde9b4e7d7e6c9cf12fcb637784e7af209cffcee3dbe304025d33abcdd +SHA512 (xfontsel-1.1.1.tar.xz.sig) = e6b28ca90155165419c176aedfc4eeeec93973914b577a53f57f6bf3d4b2b9259587ecc3051d3225416f7adcdca8405b731590e3d8954671189004ec887f52be diff --git a/xfontsel.spec b/xfontsel.spec index 8c29a08..3457886 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -1,5 +1,5 @@ Name: xfontsel -Version: 1.1.0 +Version: 1.1.1 Release: %autorelease Summary: Tool to list X11 core protocol fonts @@ -40,6 +40,8 @@ BuildRequires: automake BuildRequires: gcc BuildRequires: make +BuildRequires: gettext + BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xt) From c13f378a2c21a2f59aa0826c3f589ae9604c6d86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:05:17 +0000 Subject: [PATCH 09/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8a7f87167578070c78b5c1be81d90fe6567ef972 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 3 Nov 2024 07:06:00 -0500 Subject: [PATCH 10/24] Invoke autoreconf and configure in %conf rather than in %build --- xfontsel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfontsel.spec b/xfontsel.spec index 3457886..16016a6 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -59,9 +59,12 @@ Logical Font Description (“XLFD”) full name for a font. %autosetup -%build +%conf autoreconf --force --install --verbose %configure + + +%build %make_build From 9d7c31546ec5a4abaf7de858c4b92f62673a42ef Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 15 Dec 2024 12:13:46 -0500 Subject: [PATCH 11/24] Add a SourceLicense field --- xfontsel.spec | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/xfontsel.spec b/xfontsel.spec index 16016a6..b742b9d 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -5,14 +5,36 @@ Summary: Tool to list X11 core protocol fonts # The entire source is X11, except the following files that are not installed # or belong to the build system and therefore do not contribute to the license -# of the binary RPMs: -# - FSFAP: INSTALL -# - HPND-sell-variant: Makfile.am, Makefile.in, configure.ac -# - FSFULLR: aclocal.m4 -# - GPL-2.0-or-later: compile, depcomp, missing -# - GPL-3.0-or-later: config.guess, config,sub -# - FSFUL, or perhaps (FSFUL AND X11 AND HPND-sell-variant): configure +# of the binary RPMs… License: X11 +# FSFAP-no-warranty-disclaimer +# - INSTALL +# FSFUL AND HPND-sell-variant: +# (HPND-sell-variant is because it is derived from configure.ac) +# - configure +# FSFULLR: +# - aclocal.m4 +# FSFULLR AND HPND-sell-variant: +# - Makefile.in +# GPL-2.0-or-later WITH Autotools-exception-generic: +# - compile +# - depcomp +# - missing +# GPL-3.0-or-later WITH Autotools-exception-generic: +# - config.guess +# - config.sub +# HPND-sell-variant: +# - Makefile.am +# - configure.ac +SourceLicense: %{shrink: + %{license} AND + FSFAP-no-warranty-disclaimer AND + FSFUL AND + FSFULLR AND + GPL-2.0-or-later WITH Autotools-exception-generic AND + GPL-3.0-or-later WITH Autotools-exception-generic AND + HPND-sell-variant + } URL: https://www.x.org Source0: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz Source1: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz.sig From 5fca3cae16b3d0e466ca3fa225f06b3de744fa41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:51:17 +0000 Subject: [PATCH 12/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 02befdd11e4544750861a8d7cb043b0262725fd9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 11 May 2025 08:39:20 -0400 Subject: [PATCH 13/24] Update .rpmlintrc file for current rpmlint --- xfontsel.rpmlintrc | 2 ++ xfontsel.spec | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 xfontsel.rpmlintrc diff --git a/xfontsel.rpmlintrc b/xfontsel.rpmlintrc new file mode 100644 index 0000000..cdaa52f --- /dev/null +++ b/xfontsel.rpmlintrc @@ -0,0 +1,2 @@ +# Intentional, with a justifying spec-file comment +addFilter(r" no-%check-section") diff --git a/xfontsel.spec b/xfontsel.spec index b742b9d..7187588 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -94,6 +94,9 @@ autoreconf --force --install --verbose %make_install +# Upstream provides no tests. + + %files %license COPYING %doc ChangeLog From a657bf28426bb887013bc32f40034c7783d63688 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 11 May 2025 08:37:49 -0400 Subject: [PATCH 14/24] Fix typo in License expression --- xfontsel.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xfontsel.spec b/xfontsel.spec index 7187588..d95950a 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -16,11 +16,11 @@ License: X11 # - aclocal.m4 # FSFULLR AND HPND-sell-variant: # - Makefile.in -# GPL-2.0-or-later WITH Autotools-exception-generic: +# GPL-2.0-or-later WITH Autoconf-exception-generic: # - compile # - depcomp # - missing -# GPL-3.0-or-later WITH Autotools-exception-generic: +# GPL-3.0-or-later WITH Autoconf-exception-generic: # - config.guess # - config.sub # HPND-sell-variant: @@ -31,8 +31,8 @@ SourceLicense: %{shrink: FSFAP-no-warranty-disclaimer AND FSFUL AND FSFULLR AND - GPL-2.0-or-later WITH Autotools-exception-generic AND - GPL-3.0-or-later WITH Autotools-exception-generic AND + GPL-2.0-or-later WITH Autoconf-exception-generic AND + GPL-3.0-or-later WITH Autoconf-exception-generic AND HPND-sell-variant } URL: https://www.x.org From 9355d884a8496ef1066ba8924155d002a0b64e1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:51:00 +0000 Subject: [PATCH 15/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7cefa00a478d572d73a5c864576f8c289fb9f738 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:40:59 +0000 Subject: [PATCH 16/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 1c9685c08efd0835a6dfb5b15d515da4723650fa Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Jan 2026 07:13:09 +0000 Subject: [PATCH 17/24] Depend on gpgverify rather than gnupg2 for source file verification --- xfontsel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfontsel.spec b/xfontsel.spec index d95950a..72aa74c 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -54,7 +54,7 @@ Source1: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz.sig # --keyserver=hkps://keys.openpgp.org Source2: xfontsel.gpg -BuildRequires: gnupg2 +BuildRequires: gpgverify BuildRequires: autoconf BuildRequires: automake From 6290db43da97a7db784f426c2e123fac0c55041d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 25 May 2026 07:17:33 +0100 Subject: [PATCH 18/24] Trivial whitespace adjustment [skip changelog] --- xfontsel.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/xfontsel.spec b/xfontsel.spec index 72aa74c..de5327c 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -27,14 +27,14 @@ License: X11 # - Makefile.am # - configure.ac SourceLicense: %{shrink: - %{license} AND - FSFAP-no-warranty-disclaimer AND - FSFUL AND - FSFULLR AND - GPL-2.0-or-later WITH Autoconf-exception-generic AND - GPL-3.0-or-later WITH Autoconf-exception-generic AND - HPND-sell-variant - } + %{license} AND + FSFAP-no-warranty-disclaimer AND + FSFUL AND + FSFULLR AND + GPL-2.0-or-later WITH Autoconf-exception-generic AND + GPL-3.0-or-later WITH Autoconf-exception-generic AND + HPND-sell-variant + } URL: https://www.x.org Source0: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz Source1: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz.sig @@ -99,8 +99,10 @@ autoreconf --force --install --verbose %files %license COPYING + %doc ChangeLog %doc README.md + %{_bindir}/xfontsel %{_mandir}/man1/xfontsel.1* %{_datadir}/X11/app-defaults/XFontSel From 122eed9265a48729787e5d778841fc710d995b75 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 25 May 2026 07:32:43 +0100 Subject: [PATCH 19/24] Improve license analysis; correct SourceLicense field --- xfontsel.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xfontsel.spec b/xfontsel.spec index de5327c..beb267c 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -12,7 +12,8 @@ License: X11 # FSFUL AND HPND-sell-variant: # (HPND-sell-variant is because it is derived from configure.ac) # - configure -# FSFULLR: +# FSFULLR AND FSFULLRWD AND GPL-2.0-or-later WITH Autoconf-exception-generic +# AND MIT AND GPL-3.0-or-later WITH Autoconf-exception-generic AND X11 # - aclocal.m4 # FSFULLR AND HPND-sell-variant: # - Makefile.in @@ -31,6 +32,7 @@ SourceLicense: %{shrink: FSFAP-no-warranty-disclaimer AND FSFUL AND FSFULLR AND + FSFULLRWD AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-3.0-or-later WITH Autoconf-exception-generic AND HPND-sell-variant From 1e09561113f0dd4471880153cb71d4327a89c78f Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 30 Jun 2026 21:16:59 -0300 Subject: [PATCH 20/24] simplify .gitignore file [skip changelog] Signed-off-by: Filipe Rosset --- .gitignore | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 619edff..be86d93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/xfontsel-*.tar.bz2 -/xfontsel-1.0.6.tar.bz2.sig -/xfontsel-1.1.0.tar.xz -/xfontsel-1.1.0.tar.xz.sig -/xfontsel-1.1.1.tar.xz -/xfontsel-1.1.1.tar.xz.sig +/xfontsel-*.tar.?z* From 30220461cb0faad829ff174145a22442c19e483e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 1 Jul 2026 10:04:13 +0100 Subject: [PATCH 21/24] Configure Packit [skip changelog] --- packit.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packit.yaml diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..716c911 --- /dev/null +++ b/packit.yaml @@ -0,0 +1,7 @@ +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide From a207542e1ac71d82380295200bb6d7cac8e3db7e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 1 Jul 2026 06:59:53 +0100 Subject: [PATCH 22/24] Update to 1.1.2 upstream release - Resolves: rhbz#2494057 - Update License and SourceLicense fields Commit co-authored by Packit automation (https://packit.dev/) --- README.packit | 3 +++ sources | 4 ++-- xfontsel.gpg | Bin 2631 -> 2919 bytes xfontsel.spec | 56 +++++++++++++++++++++++++++++++++----------------- 4 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 README.packit diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..dd0af79 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.16.1. diff --git a/sources b/sources index 317584f..ac69885 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xfontsel-1.1.1.tar.xz) = fdb1f20dc86e2e74da77ef5e62d9465ea24d1af965f1ff3a6334ffefb239130fcf28f7cde9b4e7d7e6c9cf12fcb637784e7af209cffcee3dbe304025d33abcdd -SHA512 (xfontsel-1.1.1.tar.xz.sig) = e6b28ca90155165419c176aedfc4eeeec93973914b577a53f57f6bf3d4b2b9259587ecc3051d3225416f7adcdca8405b731590e3d8954671189004ec887f52be +SHA512 (xfontsel-1.1.2.tar.xz) = 377ef4e95f68411716a9cd202f4b2468ef5638d53ebd058518bdf97319f8008052f2cb76154503a1eae76aae3ce27dfa7334428b66f738a087d0915bef69c603 +SHA512 (xfontsel-1.1.2.tar.xz.sig) = d81601ea70947ef1f92b4c646fa6b1c19ee1138e172ed74edf131e3e35d1bdf0cad16ef3ce8720cfbcc442e48cb69c8211b959f2f5fd213be0e441a344dbcf9b diff --git a/xfontsel.gpg b/xfontsel.gpg index d3018ed0cb437759887f1d403666d973bbf919e3..fd1c87389c0b497c4501a2f197072318a056be4f 100644 GIT binary patch literal 2919 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 XmCQ#`0Px{zSMBvtk95gfcU%7k)!Tm) literal 2631 zcma*pc{J1u8wc>;{Kn4Mx2z*eL^GCTH?o8*Ws58sWM5|NOLnr~q%fAu3|Y#SvSi6t z_9a`m5ppNSS~PS+cu&25^qzCyKklE;f1mR`-{(0`KBR=|O5vdw8x@cs{3z||g&qI5 zcA?yA>KuMuRlO_n8BtFpt{!DE&$wj7b9=Cm-OUS&9j{d7sog(0kvi(orj2Z?y>+9v zE^ohaV*g8KNW4YSN1R|{kh{0wz}bN)A{*^kIvjgAH&C8)SI>bC7L+av)4PZadFeUH zzpp3wc*>dlQ>HPz3 zB}{=rvQ6ZN@m}yD^h7OnxZ8uv0yjr#QodBS5L<~;MD13K#P?-3lJEf-UI>gTD0!N0 z{r2lC^cUNSgt)06(q}uLLP>($GytYjR1P#%D+7}ha}7L3xQ0>mE6aW6-Kld*%;Quh z^%h;9@3HM5L(-8Ze;RT}BHhfRN3)WK?^p3SIqdBVeS05k*dTe?$H@<_gTY{30|I?L zgFN8sPCib4E?RB@uCBLT1HFSVSOg}(T{Fdlii3>-kOcXmG>r6gv`~k`V5H&( zp%73A0`kOCgSPV|JT<*w*+wnEK+jrogr^g}z`k@jZRlOry#Z+Z>)qD{RI%yjYbzG#WgJS=OAzWRUMS1g1Sc<5dQ*& z32<`pas98$`oO^zQZ-!*& z8_vZAbyA+7G}KpzxG2&_nQH0> zY!KPAx-zg9qptJ?70V*tTmCpoaG^NGplb8^Bkra+`yCAC8xMGo-(+U69aH}}u*li< z&WDIuBnn{$C34zDCUS7&gY}K@U#Y(h^rDjoZLDmP(QvPWzM9Vj9+K7EF(pQDM^Cf= z@6*-gcqlrb=*D#4zjrZCU6_~s{9-x)rJ+4FbC%O#VnZ05yZ?a@1E2=nj%WO$XhKXR27UV zkBau1V4*2-D0b`CKdDYh3Z&e{e!`QAcTAn-jW;6{t*;xN9AuE@gGnfYxylPl(M|cD z%u=dMuXZz*$m=?T&Hc6|AL4kxGOWTqnV$473rjW$-cHhD!D0G;Jn+?eq~?Z znT|hg?hC|qo)-a%xU6{;TN5Y|Id}aShnoYKIwdDcepbsYd|Cv;3KXwrtmjSPD<w};F3VAL;gKkUIXK;UCtaTnCxIfQ_n=Z ziv}nA*2H++Q^mCK+E)~TB>+LxXQ!7A?%S|)?((o-8zKXpVJ1c*GamZlO{%*4B&`h? zK_QAAN~saSpC>!h?CmRzHlaex$(9hKh-*tV*!r-OS57^Fbn+fF{pd%(mZe$kjk(F*; zSPk*0vsbtA&)Mm@iVKr5o8AkIu=8t=Sy-a!59{f%tMy*||)5_|T zed>OOr4e5k{HR{~g`FR@K9)JNJ>t!%t4yvNS{+!Ij21C<>Qo%BOw{|(a`flM+ki_( zklm<>u=&r1G6cS$z(u3&ff}9>#E@Q8X60W4Yb*>B1^wMwm8^m$Oc?$-i99@=Y38{B zwBB`|@V+P_wlme6ZdcM(oKL#{RFTF-@fu7=j0~_r07xq6N5#v=0I-1k;IHG=PEF4~ zz$ySrbvwYR&OjId8fx%oVSZL_Y>6{PvQN8WW|ieMh-@gd@X~)uek?}|R;nRIJPeOHUf5u&`N+DAk z_gjg*hwHGA zFyf|Xzeey6tE%a$C1ja>MWj!k^8-6(jVQ*W8hQC7QJj5yqisuh=$m=1w!@<*u7Y3ZLeN&yiBgO+T3` z){VxsQ=gIEuH!gEF-T^9{LyT$b<$Wn(ss+heTwTEZW&N0Q?nG)m;R2YyvjWNDP9(df(<)|KSR-`@ba2f$wniYj>Na9}~b!R diff --git a/xfontsel.spec b/xfontsel.spec index beb267c..30e0838 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -1,22 +1,34 @@ Name: xfontsel -Version: 1.1.1 +Version: 1.1.2 Release: %autorelease Summary: Tool to list X11 core protocol fonts -# The entire source is X11, except the following files that are not installed -# or belong to the build system and therefore do not contribute to the license -# of the binary RPMs… -License: X11 -# FSFAP-no-warranty-disclaimer +# The upstream COPYING file (and meson.build) show that the license is (X11 AND +# SMLNJ AND MIT). The exact breakdown of which licenses apply to which sources +# is only clear for those sources that contain copyright notices: +# +# X11: +# - app-defaults/XFontSel (produces %%{_datadir}/X11/app-defaults/XFontSel) +# - man/xfontsel.man (produces %%{_mandir}/man1/xfontsel.1*) +# X11 AND SMLNJ: +# - ULabel.c, ULabel.h, ULabelP.h +# X11 AND MIT: +# - xfontsel.c +# Additionally, a number of files belong to the build system and therefore do +# not contribute to the license of the binary RPM. These are documented below. +License: X11 AND SMLNJ AND MIT +# FSFAP: # - INSTALL # FSFUL AND HPND-sell-variant: # (HPND-sell-variant is because it is derived from configure.ac) # - configure # FSFULLR AND FSFULLRWD AND GPL-2.0-or-later WITH Autoconf-exception-generic -# AND MIT AND GPL-3.0-or-later WITH Autoconf-exception-generic AND X11 +# AND MIT AND GPL-3.0-or-later WITH Autoconf-exception-generic AND X11: # - aclocal.m4 -# FSFULLR AND HPND-sell-variant: +# FSFULLRWD AND HPND-sell-variant: # - Makefile.in +# FSFULLRWD: +# - man/Makefile.in # GPL-2.0-or-later WITH Autoconf-exception-generic: # - compile # - depcomp @@ -27,9 +39,13 @@ License: X11 # HPND-sell-variant: # - Makefile.am # - configure.ac +# MIT: +# - meson.build +# X11 AND LicenseRef-LicenseRef-Fedora-Public-Domain: +# - install-sh SourceLicense: %{shrink: %{license} AND - FSFAP-no-warranty-disclaimer AND + FSFAP AND FSFUL AND FSFULLR AND FSFULLRWD AND @@ -40,20 +56,21 @@ SourceLicense: %{shrink: URL: https://www.x.org Source0: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz Source1: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz.sig -# Keyring created on 2021-02-23 with: +# Keyring re-created on 2026-07-01 for the 1.1.2 release with: # workdir="$(mktemp --directory)" -# gpg2 --with-fingerprint xfontsel-1.0.6.tar.bz2.sig 2>&1 | +# gpg2 --with-fingerprint xfontsel-1.1.2.tar.xz.sig 2>&1 | # awk '$2 == "using" { print "0x" $NF }' | # xargs gpg2 --homedir="${workdir}" \ -# --keyserver=hkp://pool.sks-keyservers.net --recv-keys +# --keyserver=hkps://keys.openpgp.org --recv-keys # gpg2 --homedir="${workdir}" --export --export-options export-minimal \ # > xfontsel.gpg # rm -rf "${workdir}" # Inspect keys using: -# gpg2 --list-keys --no-default-keyring --keyring ./xfontsel.gpg -# Since the SKS Keyserver Network is no longer online, you can reproduce by -# substituting: -# --keyserver=hkps://keys.openpgp.org +# gpg2 --show-keys xfontsel.gpg +# The old signing keys had expired 2023-04-21 and included at least one weak +# algorithm (dsa1024), so having to recreate the keychain is expected. The new +# key expires 2026-10-24, and upstream releases every few years, so this kind +# of trust-on-first-use verification isn’t very useful. Source2: xfontsel.gpg BuildRequires: gpgverify @@ -64,13 +81,14 @@ BuildRequires: automake BuildRequires: gcc BuildRequires: make +# configure.ac: PKG_CHECK_MODULES/AC_SEARCH_LIBS BuildRequires: gettext - BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.17 +BuildRequires: pkgconfig(xt) %description The xfontsel application provides a simple way to display the X11 core protocol From 91719de9bf59ffd81497c08e7f99144463474061 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 1 Jul 2026 10:17:20 +0100 Subject: [PATCH 23/24] Switch from autotools to meson build system --- xfontsel.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/xfontsel.spec b/xfontsel.spec index 30e0838..61eb559 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -74,19 +74,14 @@ Source1: %{url}/pub/individual/app/xfontsel-%{version}.tar.xz.sig Source2: xfontsel.gpg BuildRequires: gpgverify - -BuildRequires: autoconf -BuildRequires: automake - BuildRequires: gcc -BuildRequires: make +BuildRequires: meson -# configure.ac: PKG_CHECK_MODULES/AC_SEARCH_LIBS BuildRequires: gettext +# meson.build: dependency(…) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xt) @@ -102,16 +97,15 @@ Logical Font Description (“XLFD”) full name for a font. %conf -autoreconf --force --install --verbose -%configure +%meson %build -%make_build +%meson_build %install -%make_install +%meson_install # Upstream provides no tests. From d7897dd074d67f73c410e9face46b1ebf86c91eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:14:01 +0000 Subject: [PATCH 24/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild