diff --git a/.gitignore b/.gitignore index 5256923..553374e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/xmodmap-*.tar.xz* -/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg +/xmodmap-*.tar.xz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index cb8464b..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# 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 - diff --git a/changelog b/changelog deleted file mode 100644 index ffab380..0000000 --- a/changelog +++ /dev/null @@ -1,48 +0,0 @@ -* 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/sources b/sources index 83529ff..4089fdd 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (xmodmap-1.0.12.tar.xz) = 2319f1b7eee54d650930c9e16c06e8db5a0c19eaef1902d6196d666bcab8bc288baaea65d3b561e117fc98b918cbcd9c2660c91c556f3fa08e0f57a8f0d38f82 -SHA512 (xmodmap-1.0.12.tar.xz.sig) = 6854ff05eff0e6677224883af580537b587b287703de26481e935e309fe9e159c0a12255244ee920c5fa89eec54751a9093b9d8ee69f2e787ddd73122e8942d7 -SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = a2b4aef6f48a6d6bab50f72a23295c7be63a3e6880237f52b1983e7cfa8b2798b7e30883e4e3f09dd7b905f0eb2952ba8993f7ea9b0172266337822c9be951c0 +SHA512 (xmodmap-1.0.11.tar.xz) = a78f916f048d2017f079733becc99232c087c360ece61ec6c4fa4b5b130b96a1b10c4ce1b64a15bdcab7ea05de3c7f16035503d5be6f8ce1a7612ce71d558510 diff --git a/xmodmap.spec b/xmodmap.spec index f1361a1..5ab9a74 100644 --- a/xmodmap.spec +++ b/xmodmap.spec @@ -1,18 +1,18 @@ Name: xmodmap -Version: 1.0.12 -Release: %autorelease +Version: 1.0.11 +Release: 3%{?dist} Summary: Edit and display the X11 core keyboard map -License: MIT AND MIT-open-group +License: MIT URL: https://www.x.org -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 +Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz -BuildRequires: gcc -BuildRequires: gnupg2 -BuildRequires: meson +BuildRequires: automake libtool +BuildRequires: gcc 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 @@ -20,18 +20,15 @@ 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 -%meson -%meson_build +autoreconf -v --install +%configure --disable-silent-rules +%make_build %install -%meson_install - -%check -%meson_test +%make_install %files %license COPYING @@ -39,5 +36,28 @@ event keycodes into keysyms. %{_mandir}/man1/%{name}.1* %changelog -%autochangelog +* 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)