.gitignore

@@ -1 +1,2 @@
-/xfontsel-*.tar.?z*
+/xfontsel-*.tar.bz2
+/xfontsel-1.0.6.tar.bz2.sig

README.packit

@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 1.16.1.

changelog

@@ -1,15 +0,0 @@
-* Fri Apr 30 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.0.6-3
-- Adjust whitespace and ordering to personal preference
-- Add missing autoconf BR and drop bogus libtool BR
-- Add --force to autoreconf
-- Drop --disable-silent-rules configure argument, redundant with V=1 in
-  make_build macro
-- Slightly nicer description
-- Install ChangeLog and README
-- Add cryptographic source archive verification
-
-* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.6-2
-- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245)
-
-* Tue Mar 02 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.6-1
-- Split xfontsel out from xorg-x11-apps into a separate package (#1933945)

packit.yaml

@@ -1,7 +0,0 @@
-copy_upstream_release_description: false
-
-jobs:
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      - fedora-rawhide

sources

@@ -1,2 +1,2 @@
-SHA512 (xfontsel-1.1.2.tar.xz) = 377ef4e95f68411716a9cd202f4b2468ef5638d53ebd058518bdf97319f8008052f2cb76154503a1eae76aae3ce27dfa7334428b66f738a087d0915bef69c603
-SHA512 (xfontsel-1.1.2.tar.xz.sig) = d81601ea70947ef1f92b4c646fa6b1c19ee1138e172ed74edf131e3e35d1bdf0cad16ef3ce8720cfbcc442e48cb69c8211b959f2f5fd213be0e441a344dbcf9b
+SHA512 (xfontsel-1.0.6.tar.bz2) = 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
+SHA512 (xfontsel-1.0.6.tar.bz2.sig) = af7a9ea78dab6e9007dd900efab884220e75655e0eae78b9377566db3360691e14b6a435795f2bb7481652336dba2ae26258ccdac0210286d2442e227899e520

xfontsel.rpmlintrc

@@ -1,2 +0,0 @@
-# Intentional, with a justifying spec-file comment
-addFilter(r" no-%check-section")

xfontsel.spec

@@ -1,92 +1,43 @@
 Name:           xfontsel
-Version:        1.1.2
-Release:        %autorelease
+Version:        1.0.6
+Release:        3%{?dist}
 Summary:        Tool to list X11 core protocol fonts
 
-# 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:
-#   - aclocal.m4
-# FSFULLRWD AND HPND-sell-variant:
-#   - Makefile.in
-# FSFULLRWD:
-#   - man/Makefile.in
-# GPL-2.0-or-later WITH Autoconf-exception-generic:
-#   - compile
-#   - depcomp
-#   - missing
-# GPL-3.0-or-later WITH Autoconf-exception-generic:
-#   - config.guess
-#   - config.sub
-# HPND-sell-variant:
-#   - Makefile.am
-#   - configure.ac
-# MIT:
-#   - meson.build
-# X11 AND LicenseRef-LicenseRef-Fedora-Public-Domain:
-#   - install-sh
-SourceLicense:  %{shrink:
-    %{license} AND
-    FSFAP 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
-    }
+License:        MIT
 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 re-created on 2026-07-01 for the 1.1.2 release with:
+Source0:        https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2
+Source1:        https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2.sig
+# Keyring created on 2021-02-23 with:
 #   workdir="$(mktemp --directory)"
-#   gpg2 --with-fingerprint xfontsel-1.1.2.tar.xz.sig 2>&1 |
+#   gpg2 --with-fingerprint xfontsel-1.0.6.tar.bz2.sig 2>&1 |
 #     awk '$2 == "using" { print "0x" $NF }' |
 #     xargs gpg2 --homedir="${workdir}" \
-#         --keyserver=hkps://keys.openpgp.org --recv-keys
+#         --keyserver=hkp://pool.sks-keyservers.net --recv-keys
 #   gpg2 --homedir="${workdir}" --export --export-options export-minimal \
 #       > xfontsel.gpg
 #   rm -rf "${workdir}"
 # Inspect keys using:
-#   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
+#   gpg2 --list-keys --no-default-keyring --keyring ./xfontsel.gpg
+Source2:        %{name}.gpg
+
+BuildRequires:  gnupg2
+
+BuildRequires:  autoconf
+BuildRequires:  automake
 
-BuildRequires:  gpgverify
 BuildRequires:  gcc
-BuildRequires:  meson
+BuildRequires:  make
 
-BuildRequires:  gettext
-# meson.build: dependency(…)
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xaw7)
 BuildRequires:  pkgconfig(xmu)
-BuildRequires:  pkgconfig(xproto) >= 7.0.17
 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
+The %{name} 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.
 
@@ -96,31 +47,38 @@ Logical Font Description (“XLFD”) full name for a font.
 %autosetup
 
 
-%conf
-%meson
-
-
 %build
-%meson_build
+autoreconf --force --install --verbose
+%configure
+%make_build
 
 
 %install
-%meson_install
-
-
-# Upstream provides no tests.
+%make_install
 
 
 %files
 %license COPYING
-
 %doc ChangeLog
-%doc README.md
-
+%doc README
 %{_bindir}/xfontsel
 %{_mandir}/man1/xfontsel.1*
 %{_datadir}/X11/app-defaults/XFontSel
 
 
 %changelog
-%autochangelog
+* Fri Apr 30 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.0.6-3
+- Adjust whitespace and ordering to personal preference
+- Add missing autoconf BR and drop bogus libtool BR
+- Add --force to autoreconf
+- Drop --disable-silent-rules configure argument, redundant with V=1 in
+  make_build macro
+- Slightly nicer description
+- Install ChangeLog and README
+- Add cryptographic source archive verification
+
+* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.6-2
+- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245)
+
+* Tue Mar 02 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.6-1
+- Split xfontsel out from xorg-x11-apps into a separate package (#1933945)