4 changed files with 46 additions and 75 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-/xkill-*.tar.xz*
-/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg
+/xkill-*.tar.xz
--- a/46
+++ b/46
@ -1,46 +0,0 @@
-* Mon Mar 16 2026 Filipe Rosset <rosset.filipe@gmail.com> - 1.0.7-1
- update to 1.0.7
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 08 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.6-4
- SPDX migration
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Nov 25 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.6-1
- xkill 1.0.6
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.5-2
- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754)
-
-* Wed Mar 03 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.5-1
- Split xkill out from xorg-x11-server-utils into a separate package
-  (#1934389)
-
--- a/4
+++ b/4
@ -1,3 +1 @@
-SHA512 (xkill-1.0.7.tar.xz) = af5444da74b2af45dabd093e74b4c2e906c4742593067b6fecced6593a27b2b493e868e91672ffc17571851621b4e6716741d2eb91c5459c5bcf9867d4812d9a
-SHA512 (xkill-1.0.7.tar.xz.sig) = e6100ec63d6f013a28d45a4cdecfd24c78f23300453ef32199336b0d819dba0dce34bac0e6a0254365c808259e787ab1ea85e59d86516501599769f887f27206
-SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = 8f1042fc1ff6c68909b07f4c3b078304a6e5c7b0f32145930f6da253565bae1da4bb432c052c913dbb6854f0749a6b8746bbb1b5a52c82bbea15e17d01e3b6d1
+SHA512 (xkill-1.0.6.tar.xz) = a755a8db51d7860b9942161776390007b9b530c2f7fcf8ddb3383311d36d185a6f08a44c5f6f7735576b146902e66aca21cbd7e746c1289d035e79332e8173b6
--- a/xkill.spec
+++ b/xkill.spec
@ -1,20 +1,19 @@
-Name:           xkill
-Version:        1.0.7
-Release:        %autorelease
-Summary:        Utility to force-close an X client's connection
+Name:       xkill
+Version:    1.0.6
+Release:    3%{?dist}
+Summary:    Utility to force-close an X client's connection

-License:        MIT-open-group
-URL:            https://www.x.org
-Source0:        https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz
-Source1:        https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz.sig
-Source2:        gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg
+License:    MIT
+URL:        https://www.x.org
+Source0:    https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz

-BuildRequires:  gcc
-BuildRequires:  gpgverify
-BuildRequires:  meson
+BuildRequires:  automake libtool
+BuildRequires:  gcc make
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xmuu)
-BuildRequires:  pkgconfig(xproto) >= 7.0.22
+BuildRequires:  pkgconfig(xmu)
+BuildRequires:  pkgconfig(xorg-macros) >= 1.8
+
+Obsoletes:  xorg-x11-server-utils < 7.7-40

 %description
 xkill is a utility for forcing the X server to close connections to
@ -22,18 +21,15 @@ clients. This program is very dangerous, but is useful for aborting
 programs that have displayed undesired windows on a user's screen.

 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup

 %build
-%meson
-%meson_build
+autoreconf -v --install
+%configure --disable-silent-rules
+%make_build

 %install
-%meson_install
-
-%check
-%meson_test
+%make_install

 %files
 %license COPYING
@ -41,4 +37,28 @@ programs that have displayed undesired windows on a user's screen.
 %{_mandir}/man1/%{name}.1*

 %changelog
-%autochangelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Nov 25 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.6-1
+- xkill 1.0.6
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.5-2
+- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754)
+
+* Wed Mar 03 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.5-1
+- Split xkill out from xorg-x11-server-utils into a separate package
+  (#1934389)
+