5 changed files with 37 additions and 78 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1 @@
 /xwd-*.tar.bz2
-/xwd-*.tar.xz*
-/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg
--- a/.packit.yaml
+++ b/.packit.yaml
@ -1,19 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-specfile_path: xwd.spec
-
-copy_upstream_release_description: false
-
-jobs:
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      - fedora-rawhide
-
-  - job: koji_build
-    trigger: commit
-    allowed_committers: ['packit','all_admins']
-    dist_git_branches:
-      - fedora-rawhide
-
--- a/32
+++ b/32
@ -1,32 +0,0 @@
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 08 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.8-6
- SPDX migration
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Aug 05 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.8-1
- xwd 1.0.8
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.7-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.7-1
- Split xwd out from xorg-x11-apps into a separate package (#1933955)
--- a/4
+++ b/4
@ -1,3 +1 @@
-SHA512 (xwd-1.0.10.tar.xz) = 93be318bbc3d305f7786c9964376536f990b7172d0800193573697442770cf7ca47ef20d869af0c365b894ef41cc8721fd0a6d6b439fd95bf9ebf7859e2d96d6
-SHA512 (xwd-1.0.10.tar.xz.sig) = d469fac7314ee12964d03f9f537d60c5b34e3994b11da4ab6cabb9e96ff81d097cd30c3dfde2582467f32f5be10a369979a012c518d55b80f54903b111e4357c
-SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = a2b4aef6f48a6d6bab50f72a23295c7be63a3e6880237f52b1983e7cfa8b2798b7e30883e4e3f09dd7b905f0eb2952ba8993f7ea9b0172266337822c9be951c0
+SHA512 (xwd-1.0.8.tar.bz2) = d2aaf42c60d20c4b09f4947d3702058dbfad4633b2c5c8ea62e8897fc9ced1ab3417ce99255a223286d21a731f543019470737e3074f1bc68033b4eb47bc773e
--- a/xwd.spec
+++ b/xwd.spec
@ -1,24 +1,19 @@
 Name:       xwd
-Version:    1.0.10
-Release:    %autorelease
+Version:    1.0.8
+Release:    5%{?dist}
 Summary:    Dump an X window to file

-%global forgeurl https://gitlab.freedesktop.org/xorg/app/xwd
-%global tag %{name}-%{version}
-%forgemeta
-
-License:    MIT-open-group AND HPND-sell-variant
+License:    MIT
 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
+Source0:    https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2

-BuildRequires:  gcc
-BuildRequires:  gpgverify
-BuildRequires:  meson
+BuildRequires:  automake libtool
+BuildRequires:  gcc make
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xkbfile)
-BuildRequires:  pkgconfig(xproto) >= 7.0.25
+BuildRequires:  pkgconfig(xorg-macros) >= 1.8
+
+Obsoletes:  xorg-x11-apps < 7.7-31

 %description
 Xwd is an X Window System window dumping utility. Xwd allows X users to
@ -27,18 +22,15 @@ be read by various other X utilities for redisplay, printing, editing,
 formatting, archiving, image processing, etc.

 %prep
-%gpgverify -k 2 -s 1 -d 0
 %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
@ -46,4 +38,26 @@ formatting, archiving, image processing, etc.
 %{_mandir}/man1/%{name}.1*

 %changelog
-%autochangelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Aug 05 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.8-1
+- xwd 1.0.8
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.7-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.7-1
+- Split xwd out from xorg-x11-apps into a separate package (#1933955)