diff --git a/xmessage.rpmlintrc b/xmessage.rpmlintrc
deleted file mode 100644
index cdaa52f..0000000
--- a/xmessage.rpmlintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Intentional, with a justifying spec-file comment
-addFilter(r" no-%check-section")
diff --git a/xmessage.spec b/xmessage.spec
index 26e2685..c64c446 100644
--- a/xmessage.spec
+++ b/xmessage.spec
@@ -5,39 +5,14 @@ Summary:        Display a message in a window
 
 # 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…
+# 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
 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 AND FSFULLRWD AND GPL-2.0-or-later WITH Autoconf-exception-generic
-# AND GPL-3.0-or-later WITH Autoconf-exception-generic AND MIT AND X11:
-#   - aclocal.m4
-# FSFULLR AND HPND-sell-variant:
-#   - 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
-SourceLicense:  %{shrink:
-    %{license} AND
-    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 AND
-    MIT
-    }
 URL:            https://www.x.org
 Source0:        %{url}/pub/individual/app/%{name}-%{version}.tar.xz
 Source1:        %{url}/pub/individual/app/%{name}-%{version}.tar.xz.sig
@@ -56,7 +31,7 @@ Source1:        %{url}/pub/individual/app/%{name}-%{version}.tar.xz.sig
 # was obtained on 2021-02-23.
 Source2:        %{name}.gpg
 
-BuildRequires:  gpgverify
+BuildRequires:  gnupg2
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -80,12 +55,9 @@ question. xmessage can also exit after a specified time.
 %autosetup
 
 
-%conf
+%build
 autoreconf --force --install --verbose
 %configure
-
-
-%build
 %make_build
 
 
@@ -93,9 +65,6 @@ autoreconf --force --install --verbose
 %make_install
 
 
-# Upstream does not provide any tests.
-
-
 %files
 %license COPYING