From 6eea3db7d3ac8639cac5cfe54003c28c3aa72230 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:57:13 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmodmap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmodmap.spec b/xmodmap.spec index 96dc0f6..c9b5c3a 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -1,6 +1,6 @@ Name: xmodmap Version: 1.0.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Edit and display the X11 core keyboard map License: MIT AND MIT-open-group @@ -36,6 +36,9 @@ autoreconf -v --install %{_mandir}/man1/%{name}.1* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.0.11-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 81dbededd1f5499c652091d184eb0747e9759698 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:46:54 +0000 Subject: [PATCH 2/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmodmap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmodmap.spec b/xmodmap.spec index c9b5c3a..9d43bf4 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -1,6 +1,6 @@ Name: xmodmap Version: 1.0.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Edit and display the X11 core keyboard map License: MIT AND MIT-open-group @@ -36,6 +36,9 @@ autoreconf -v --install %{_mandir}/man1/%{name}.1* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.0.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.0.11-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3fa2358fb7219eb97605ad88a9b73ffad47a6c2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:19:40 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmodmap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmodmap.spec b/xmodmap.spec index 9d43bf4..7700a68 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -1,6 +1,6 @@ Name: xmodmap Version: 1.0.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Edit and display the X11 core keyboard map License: MIT AND MIT-open-group @@ -36,6 +36,9 @@ autoreconf -v --install %{_mandir}/man1/%{name}.1* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.0.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.0.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 3e1710aa2c239d71955be5acda3c62b053fff98d Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 21 Jul 2026 02:03:05 -0300 Subject: [PATCH 4/8] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ xmodmap.spec | 52 ++-------------------------------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ffab380 --- /dev/null +++ b/changelog @@ -0,0 +1,48 @@ +* Fri Jul 17 2026 Fedora Release Engineering - 1.0.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 1.0.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.0.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 08 2023 Peter Hutterer - 1.0.11-5 +- SPDX migration + +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jul 11 2022 Peter Hutterer - 1.0.11-1 +- xmodmap 1.0.11 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu May 06 2021 Peter Hutterer 1.0.10-1 +- xmodmap 1.0.10 + +* Thu Apr 08 2021 Peter Hutterer - 1.0.9-2 +- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754) + +* Wed Mar 03 2021 Peter Hutterer 1.0.9-1 +- Split xmodmap out from xorg-x11-server-utils into a separate package + (#1934390) diff --git a/xmodmap.spec b/xmodmap.spec index 7700a68..a62ce8b 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -1,6 +1,6 @@ Name: xmodmap Version: 1.0.11 -Release: 11%{?dist} +Release: %autorelease Summary: Edit and display the X11 core keyboard map License: MIT AND MIT-open-group @@ -36,52 +36,4 @@ autoreconf -v --install %{_mandir}/man1/%{name}.1* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.0.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.0.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.0.11-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.0.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.0.11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 08 2023 Peter Hutterer - 1.0.11-5 -- SPDX migration - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jul 11 2022 Peter Hutterer - 1.0.11-1 -- xmodmap 1.0.11 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu May 06 2021 Peter Hutterer 1.0.10-1 -- xmodmap 1.0.10 - -* Thu Apr 08 2021 Peter Hutterer - 1.0.9-2 -- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754) - -* Wed Mar 03 2021 Peter Hutterer 1.0.9-1 -- Split xmodmap out from xorg-x11-server-utils into a separate package - (#1934390) - +%autochangelog From a73a5ef91f9fc5f71d25ad6fdce3337b9d6eeb82 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 21 Jul 2026 02:09:26 -0300 Subject: [PATCH 5/8] update to 1.0.12 fixes rhbz#2502637 Signed-off-by: Filipe Rosset --- .gitignore | 2 ++ sources | 4 +++- xmodmap.spec | 20 ++++++++++++++------ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 553374e..1a84018 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /xmodmap-*.tar.xz +/xmodmap-1.0.12.tar.xz.sig +/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg diff --git a/sources b/sources index 4089fdd..83529ff 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (xmodmap-1.0.11.tar.xz) = a78f916f048d2017f079733becc99232c087c360ece61ec6c4fa4b5b130b96a1b10c4ce1b64a15bdcab7ea05de3c7f16035503d5be6f8ce1a7612ce71d558510 +SHA512 (xmodmap-1.0.12.tar.xz) = 2319f1b7eee54d650930c9e16c06e8db5a0c19eaef1902d6196d666bcab8bc288baaea65d3b561e117fc98b918cbcd9c2660c91c556f3fa08e0f57a8f0d38f82 +SHA512 (xmodmap-1.0.12.tar.xz.sig) = 6854ff05eff0e6677224883af580537b587b287703de26481e935e309fe9e159c0a12255244ee920c5fa89eec54751a9093b9d8ee69f2e787ddd73122e8942d7 +SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = a2b4aef6f48a6d6bab50f72a23295c7be63a3e6880237f52b1983e7cfa8b2798b7e30883e4e3f09dd7b905f0eb2952ba8993f7ea9b0172266337822c9be951c0 diff --git a/xmodmap.spec b/xmodmap.spec index a62ce8b..c4ff3f4 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -1,25 +1,29 @@ Name: xmodmap -Version: 1.0.11 +Version: 1.0.12 Release: %autorelease Summary: Edit and display the X11 core keyboard map License: MIT AND MIT-open-group URL: https://www.x.org -Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz +Source0: https://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.xz +Source1: https://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.xz.sig +Source2: gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg -BuildRequires: automake libtool -BuildRequires: gcc make +BuildRequires: automake +BuildRequires: gcc +BuildRequires: gnupg2 +BuildRequires: libtool +BuildRequires: make BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -Obsoletes: xorg-x11-server-utils < 7.7-40 - %description The xmodmap program is used to edit and display the keyboard modifier map and keymap table that are used by client applications to convert event keycodes into keysyms. %prep +%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0} %autosetup %build @@ -30,6 +34,9 @@ autoreconf -v --install %install %make_install +%check +%make_build check + %files %license COPYING %{_bindir}/%{name} @@ -37,3 +44,4 @@ autoreconf -v --install %changelog %autochangelog + From 3fcc8c593a3b82a1787bd08d748ae8c01010f505 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 21 Jul 2026 02:10:01 -0300 Subject: [PATCH 6/8] simplify .gitignore file Signed-off-by: Filipe Rosset --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1a84018..5256923 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/xmodmap-*.tar.xz -/xmodmap-1.0.12.tar.xz.sig +/xmodmap-*.tar.xz* /gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg From e20f82597098c76f40eaf75d7cd75cdfe7868d66 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 21 Jul 2026 02:10:13 -0300 Subject: [PATCH 7/8] 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..cb8464b --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: xmodmap.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 fb7803313992f75fab87548561dec12bdd2d1e28 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 21 Jul 2026 02:22:48 -0300 Subject: [PATCH 8/8] switch from autotools to meson build system Signed-off-by: Filipe Rosset --- xmodmap.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/xmodmap.spec b/xmodmap.spec index c4ff3f4..f1361a1 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -9,13 +9,10 @@ Source0: https://xorg.freedesktop.org/archive/individual/app/%{name}-%{versio Source1: https://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.xz.sig Source2: gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg -BuildRequires: automake BuildRequires: gcc BuildRequires: gnupg2 -BuildRequires: libtool -BuildRequires: make +BuildRequires: meson BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 %description The xmodmap program is used to edit and display the keyboard modifier @@ -27,15 +24,14 @@ event keycodes into keysyms. %autosetup %build -autoreconf -v --install -%configure --disable-silent-rules -%make_build +%meson +%meson_build %install -%make_install +%meson_install %check -%make_build check +%meson_test %files %license COPYING