From acbfe268be605311c1c5745013fe667721bf0c29 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 28 Oct 2024 23:20:30 -0300 Subject: [PATCH 01/11] Convert to %autorelease and %autochangelog --- changelog | 32 ++++++++++++++++++++++++++++++++ xwd.spec | 35 ++--------------------------------- 2 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..9f80140 --- /dev/null +++ b/changelog @@ -0,0 +1,32 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 08 2023 Peter Hutterer - 1.0.8-6 +- SPDX migration + +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Aug 05 2021 Peter Hutterer - 1.0.8-1 +- xwd 1.0.8 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Apr 08 2021 Peter Hutterer - 1.0.7-2 +- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245) + +* Tue Mar 02 2021 Peter Hutterer 1.0.7-1 +- Split xwd out from xorg-x11-apps into a separate package (#1933955) diff --git a/xwd.spec b/xwd.spec index e25876e..139279b 100644 --- a/xwd.spec +++ b/xwd.spec @@ -1,6 +1,6 @@ Name: xwd Version: 1.0.8 -Release: 8%{?dist} +Release: %autorelease Summary: Dump an X window to file License: MIT-open-group AND HPND-sell-variant @@ -38,35 +38,4 @@ autoreconf -v --install %{_mandir}/man1/%{name}.1* %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 1.0.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 08 2023 Peter Hutterer - 1.0.8-6 -- SPDX migration - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Aug 05 2021 Peter Hutterer - 1.0.8-1 -- xwd 1.0.8 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Apr 08 2021 Peter Hutterer - 1.0.7-2 -- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245) - -* Tue Mar 02 2021 Peter Hutterer 1.0.7-1 -- Split xwd out from xorg-x11-apps into a separate package (#1933955) +%autochangelog From 6b1f47cf82bbf174157b10dce9fd0b08dc3f88ba Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 28 Oct 2024 23:23:29 -0300 Subject: [PATCH 02/11] update xwd to 1.0.9 fixes rhbz#2230931 --- .gitignore | 2 ++ sources | 2 +- xwd.spec | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 386716a..d35701b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /xwd-*.tar.bz2 +/xwd-1.0.9.tar.xz +/xwd-1.0.9.tar.xz.sig diff --git a/sources b/sources index 0d6e820..3933a0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xwd-1.0.8.tar.bz2) = d2aaf42c60d20c4b09f4947d3702058dbfad4633b2c5c8ea62e8897fc9ced1ab3417ce99255a223286d21a731f543019470737e3074f1bc68033b4eb47bc773e +SHA512 (xwd-1.0.9.tar.xz.sig) = 07923628085da7da7322ef7878ed48b91b2fd8ae13f9c0c4b3b5b1f8de194ae65c26c3b4b1a209aeee85485522bbf7f4758b3c60a57dfd1fe58fdcc19bc01c54 diff --git a/xwd.spec b/xwd.spec index 139279b..ec4c9a7 100644 --- a/xwd.spec +++ b/xwd.spec @@ -1,11 +1,11 @@ Name: xwd -Version: 1.0.8 +Version: 1.0.9 Release: %autorelease Summary: Dump an X window to file License: MIT-open-group AND HPND-sell-variant URL: https://www.x.org -Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz BuildRequires: automake libtool BuildRequires: gcc make From 9cb09ebe4b2d542a98886646fa991d75959a26f1 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 28 Oct 2024 23:23:52 -0300 Subject: [PATCH 03/11] update xwd to 1.0.9 fixes rhbz#2230931 --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 3933a0f..bcaaee9 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (xwd-1.0.9.tar.xz) = ae59661b05160f5658920fd79031b6b8548cb7bbfc734194edb0acef5c95f76b210ca4443e9506fc1a0cb9df47ee7c22948502971afe578b44c75aa2a1138d56 SHA512 (xwd-1.0.9.tar.xz.sig) = 07923628085da7da7322ef7878ed48b91b2fd8ae13f9c0c4b3b5b1f8de194ae65c26c3b4b1a209aeee85485522bbf7f4758b3c60a57dfd1fe58fdcc19bc01c54 From cb5c6424e94a295709951da8c7ca7a62c3e961f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:25:51 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f4c26b20c8c9c5a5f08033f9833b2cd70554992e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:08:29 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4613743c9b4ba673c5ffcefd935629077a9f7bb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:58:02 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 8f3158912bf5987b72cf87e403e2a8968fc021b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:30:34 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 190da006c3c044680d18575788b8466e2e3937f3 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 13 Jul 2026 16:57:29 -0300 Subject: [PATCH 08/11] update to 1.0.10, built with meson build system Signed-off-by: Filipe Rosset --- .gitignore | 3 +++ sources | 5 +++-- xwd.spec | 24 ++++++++++++++---------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index d35701b..eba90a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /xwd-*.tar.bz2 /xwd-1.0.9.tar.xz /xwd-1.0.9.tar.xz.sig +/xwd-1.0.10.tar.xz +/xwd-1.0.10.tar.xz.sig +/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg diff --git a/sources b/sources index bcaaee9..4d86bdf 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (xwd-1.0.9.tar.xz) = ae59661b05160f5658920fd79031b6b8548cb7bbfc734194edb0acef5c95f76b210ca4443e9506fc1a0cb9df47ee7c22948502971afe578b44c75aa2a1138d56 -SHA512 (xwd-1.0.9.tar.xz.sig) = 07923628085da7da7322ef7878ed48b91b2fd8ae13f9c0c4b3b5b1f8de194ae65c26c3b4b1a209aeee85485522bbf7f4758b3c60a57dfd1fe58fdcc19bc01c54 +SHA512 (xwd-1.0.10.tar.xz) = 93be318bbc3d305f7786c9964376536f990b7172d0800193573697442770cf7ca47ef20d869af0c365b894ef41cc8721fd0a6d6b439fd95bf9ebf7859e2d96d6 +SHA512 (xwd-1.0.10.tar.xz.sig) = d469fac7314ee12964d03f9f537d60c5b34e3994b11da4ab6cabb9e96ff81d097cd30c3dfde2582467f32f5be10a369979a012c518d55b80f54903b111e4357c +SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = a2b4aef6f48a6d6bab50f72a23295c7be63a3e6880237f52b1983e7cfa8b2798b7e30883e4e3f09dd7b905f0eb2952ba8993f7ea9b0172266337822c9be951c0 diff --git a/xwd.spec b/xwd.spec index ec4c9a7..184aab6 100644 --- a/xwd.spec +++ b/xwd.spec @@ -1,19 +1,20 @@ Name: xwd -Version: 1.0.9 +Version: 1.0.10 Release: %autorelease Summary: Dump an X window to file License: MIT-open-group AND HPND-sell-variant 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 -BuildRequires: automake libtool -BuildRequires: gcc make +BuildRequires: gcc +BuildRequires: gpgverify +BuildRequires: meson BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xkbfile) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 - -Obsoletes: xorg-x11-apps < 7.7-31 +BuildRequires: pkgconfig(xproto) >= 7.0.25 %description Xwd is an X Window System window dumping utility. Xwd allows X users to @@ -22,15 +23,18 @@ 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 -autoreconf -v --install -%configure --disable-silent-rules -%make_build +%meson +%meson_build %install -%make_install +%meson_install + +%check +%meson_test %files %license COPYING From 806545b0d8cdab76a2d07b9b49d339bef3e13e15 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 13 Jul 2026 16:57:55 -0300 Subject: [PATCH 09/11] simplify .gitignore file Signed-off-by: Filipe Rosset --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index eba90a1..98abec3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ /xwd-*.tar.bz2 -/xwd-1.0.9.tar.xz -/xwd-1.0.9.tar.xz.sig -/xwd-1.0.10.tar.xz -/xwd-1.0.10.tar.xz.sig +/xwd-*.tar.xz* /gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg From 5c1b9744c97ef249516d27430a6d1325e80df493 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Mon, 13 Jul 2026 16:58:07 -0300 Subject: [PATCH 10/11] opt-in to packit for rawhide Signed-off-by: Filipe Rosset --- .packit.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..b776005 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# 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 + From e010d95d9cc3c003b66ac6334d3617679e407c64 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Fri, 14 Aug 2026 22:26:49 -0300 Subject: [PATCH 11/11] move to forge macros --- xwd.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xwd.spec b/xwd.spec index 184aab6..ffa4ed0 100644 --- a/xwd.spec +++ b/xwd.spec @@ -3,6 +3,10 @@ Version: 1.0.10 Release: %autorelease 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 URL: https://www.x.org Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz