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* 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/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 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 d3018ed..fd1c873 100644 Binary files a/xfontsel.gpg and b/xfontsel.gpg differ 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..61eb559 100644 --- a/xfontsel.spec +++ b/xfontsel.spec @@ -1,74 +1,89 @@ 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: +# 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: +# FSFULLRWD AND HPND-sell-variant: # - Makefile.in -# GPL-2.0-or-later WITH Autotools-exception-generic: +# FSFULLRWD: +# - man/Makefile.in +# 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: # - 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 - 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 - } + %{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 + } 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: gnupg2 - -BuildRequires: autoconf -BuildRequires: automake - +BuildRequires: gpgverify BuildRequires: gcc -BuildRequires: make +BuildRequires: meson BuildRequires: gettext - +# meson.build: dependency(…) BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xaw7) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xproto) >= 7.0.17 +BuildRequires: pkgconfig(xt) %description The xfontsel application provides a simple way to display the X11 core protocol @@ -82,22 +97,26 @@ 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. %files %license COPYING + %doc ChangeLog %doc README.md + %{_bindir}/xfontsel %{_mandir}/man1/xfontsel.1* %{_datadir}/X11/app-defaults/XFontSel