From 3b72097f208916311e4ee475ea890b5fa41d6af4 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 31 Mar 2026 14:44:41 -0300 Subject: [PATCH 1/7] update to 1.3.5 --- setxkbmap.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/setxkbmap.spec b/setxkbmap.spec index e2df8dd..2b15946 100644 --- a/setxkbmap.spec +++ b/setxkbmap.spec @@ -1,6 +1,6 @@ Name: setxkbmap -Version: 1.3.4 -Release: 7%{?dist} +Version: 1.3.5 +Release: 1%{?dist} Summary: X11 keymap client License: HPND @@ -35,6 +35,9 @@ on the command line. %{_mandir}/man1/setxkbmap.1* %changelog +* Tue Mar 31 2026 Filipe Rosset - 1.3.5-1 +- Update to 1.3.5 + * Sat Jan 17 2026 Fedora Release Engineering - 1.3.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild diff --git a/sources b/sources index 708b452..81a43e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setxkbmap-1.3.4.tar.xz) = f4d026e7707656173f54d79b95ff3370ae06eaf252b89b79bc7175edeaf3ef79073d4d7d8a35fdee95608bf85d7d23514d74f00e55b613810ef6c3ccc0cf498b +SHA512 (setxkbmap-1.3.5.tar.xz) = 57a7e4c0331f81e6e61240f0da69d536e0838c46191f789b7b2ca3a6a5a3d0169a28b71e108bbcf8d24d10068c63a7f65eb9196a3774dbd8a00db9ecc0df46a0 From 820e93b263a0be3b63db7441228997d7d1af6de7 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 31 Mar 2026 14:47:46 -0300 Subject: [PATCH 2/7] silent rpmlint, fix BuildRequires in alphabetical order --- setxkbmap.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setxkbmap.spec b/setxkbmap.spec index 2b15946..b0a3bd1 100644 --- a/setxkbmap.spec +++ b/setxkbmap.spec @@ -7,12 +7,15 @@ License: HPND URL: https://www.x.org Source0: https://www.x.org/pub/individual/app/setxkbmap-%{version}.tar.xz -BuildRequires: make gcc -BuildRequires: pkgconfig(x11) pkgconfig(xrandr) +BuildRequires: gcc +BuildRequires: make +BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xrandr) Obsoletes: xorg-x11-xkb-utils < 7.8 +Provides: xorg-x11-xkb-utils >= 7.8 %description setxkbmap is an X11 client to change the keymaps in the X server for a From deb9b39a8a480559685a3cad650559211155ba62 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 31 Mar 2026 14:47:56 -0300 Subject: [PATCH 3/7] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 51 +++++++++++++++++++++++++++++++++++++++++++++++ setxkbmap.spec | 54 ++------------------------------------------------ 2 files changed, 53 insertions(+), 52 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..1f84b79 --- /dev/null +++ b/changelog @@ -0,0 +1,51 @@ +* Tue Mar 31 2026 Filipe Rosset - 1.3.5-1 +- Update to 1.3.5 + +* Sat Jan 17 2026 Fedora Release Engineering - 1.3.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 1.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Sep 05 2023 Peter Hutterer +- SPDX migration: switch to HPND license identifier + +* Sat Jul 22 2023 Fedora Release Engineering - 1.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon May 15 2023 Peter Hutterer - 1.3.4-1 +- setxkbmap 1.3.4 + +* Sat Jan 21 2023 Fedora Release Engineering - 1.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Apr 04 2022 Peter Hutterer - 1.3.3-2 +- Add libXrandr as dependency needed for the Xwayland warning + +* Mon Apr 04 2022 Peter Hutterer - 1.3.3-1 +- setxkbmap 1.3.3 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 05 2020 Peter Hutterer 1.3.2-2 +- Split setxkbmap out from xorg-x11-xkb-utils into its own package + (#1895795) diff --git a/setxkbmap.spec b/setxkbmap.spec index b0a3bd1..81efccc 100644 --- a/setxkbmap.spec +++ b/setxkbmap.spec @@ -1,6 +1,6 @@ Name: setxkbmap Version: 1.3.5 -Release: 1%{?dist} +Release: %autorelease Summary: X11 keymap client License: HPND @@ -38,54 +38,4 @@ on the command line. %{_mandir}/man1/setxkbmap.1* %changelog -* Tue Mar 31 2026 Filipe Rosset - 1.3.5-1 -- Update to 1.3.5 - -* Sat Jan 17 2026 Fedora Release Engineering - 1.3.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.3.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.3.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Sep 05 2023 Peter Hutterer -- SPDX migration: switch to HPND license identifier - -* Sat Jul 22 2023 Fedora Release Engineering - 1.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon May 15 2023 Peter Hutterer - 1.3.4-1 -- setxkbmap 1.3.4 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.3.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Apr 04 2022 Peter Hutterer - 1.3.3-2 -- Add libXrandr as dependency needed for the Xwayland warning - -* Mon Apr 04 2022 Peter Hutterer - 1.3.3-1 -- setxkbmap 1.3.3 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.3.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 05 2020 Peter Hutterer 1.3.2-2 -- Split setxkbmap out from xorg-x11-xkb-utils into its own package - (#1895795) +%autochangelog From a4032846429d97109a4e2b11f0229a533d8c9883 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 31 Mar 2026 15:02:45 -0300 Subject: [PATCH 4/7] add source code gnupg key validation --- .gitignore | 2 +- 3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.asc | 68 ++++++++++++++++++++ setxkbmap.spec | 4 ++ sources | 2 +- 4 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.asc diff --git a/.gitignore b/.gitignore index f339b52..911b23d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/setxkbmap-*.tar.xz +/setxkbmap-*.tar.xz* diff --git a/3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.asc b/3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.asc new file mode 100644 index 0000000..70ae4df --- /dev/null +++ b/3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.asc @@ -0,0 +1,68 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: 3AB2 8523 2C46 AE43 D8E1 92F4 DAB0 F78E A6E7 E2D2 +Comment: Alan Coopersmith +Comment: Alan Coopersmith + +xsFNBGcZqbgBEADGfkmk3rqQd6paZBga2gCwDhRSXTCUNcZnwDJg//yVZplZH0ez +pWPKzw4dHm01b6wGEQhlhwU5jTzSgAzEYzKr6kFhMH06HYp03kU26mVS6pUzcISq +NHdcFWpkJbhUKvORe4/DxXQvoIGPz/Pxqh4lAqA6Xce2+lKnH6n1oXXOvpNk+aLE +Nhb0fD/xTwoHXb3rgLBD73gX82EhWHVaqeotLM1phak+gw6N3X1e17UkDBlFMPiG +fkmoLxTeOlH+2fcPCtT5kO6/iidkeG81bAsNG2ukhKzEavhaBwHMTwre5TMEZuRp +hu9WY7tQR+osCHMqsEeXlIuCP8JV9848CmIzTpJokz/nCQEdPPpvwL+nymHi53KG +3Gn2VM8oiSrST2h5b38qz2Dv+pNLOKBD01Htv5mICkqNdYSk2T2sqfCEC0/wNbp8 +ykn8zwRvYRhK4Upoj3KucFkXyhJRfXaDfCW9/PjlspQzbMR9F/jJIZf7+lCdPYF7 +nEvBk2cwaEgYqT/yWxSmYtloMvYus9wbyVsnn356lQX0xF6/UK3NECC3LqFM42P2 +VMydo1nYap2JkFa7jlkWcljiYJRieTJ3HP09Hw4KIlwKMcRGx+ejnj8m+k0GGJFw +ez8KiG0PBcuT8ednZlNCAvfEwD0YYDR4YwsKKuf28Ymz2POcz7Mg4SzmTwARAQAB +zS5BbGFuIENvb3BlcnNtaXRoIDxhbGFuLmNvb3BlcnNtaXRoQG9yYWNsZS5jb20+ +wsGUBBMBCgA+FiEEOrKFIyxGrkPY4ZL02rD3jqbn4tIFAmcZqbgCGwMFCQPCZwAF +CwkIBwMFFQoJCAsFFgMCAQACHgUCF4AACgkQ2rD3jqbn4tJNyg//XkV+XJxxTCeJ +a4ahNtfAiE5vv7nsk4gbKK26n41X68wl/ted3uANGEgtXnRfXu+kTZEeuukpAAyu +QSS0NNnRe5sXBOj7uWMynXJTuThBuCYaVpqmmixicIQsdCUQVrxZVxOkw4Lil6hr +Ap9gInEN31/11lcVb/M3/4qt7KgbL8Bqbr5hnlxKGgL9zU4ke7ii7XCClT3djgAu ++dfLVYcEkZwqhNG+x1oz1dFmRsOJxChwk4ErtFmy9VwbvRdRJ6PPgqN//gE9rdrU +clmfSx5JzGzpkXK7xJAqvfFm9J+079j97joO5A1YBPDXO30V5SIpWoi3lGhW2gNp +tbKfzHL8pfbIbrCAzYDklRN+n7aoEhV7nffXf3qMvDARb4MAfz6QH2S+j6oHrGcf +6Uw/xfRnQe4bkQrkst5p4Bf8PfZC6fflut7sGqFvQLaItPRgSdNMB8D5Xwruztke +ZkBo+Viziybd30/1mJC5n3LZpN5+cwpjXKpdJFQij5MBW0VyxoescceI8q9YUv7f +My1y9NoSBU0xngTyOuNSpBaUaxPpPHqmaInEec/PSFu5wvtGiebKLLxU2l6t0ZuK +Njn4zEIYSFDeY7/sMYkL4ij1upSF2zBnjnZGlrwNHmzcFkqGMnU4X8s+Ua/1lU4B +HnvNEyEEWZ7TrVnkylMJd7snmIi4g//NKEFsYW4gQ29vcGVyc21pdGggPGFsYW5j +QGZyZWVkZXNrdG9wLm9yZz7CwZQEEwEKAD4WIQQ6soUjLEauQ9jhkvTasPeOpufi +0gUCZ746HQIbAwUJA8JnAAULCQgHAwUVCgkICwUWAwIBAAIeBQIXgAAKCRDasPeO +pufi0pXGEACtxXfsBsyFiJxBhMREp0OA7/KrLUm1JWuvV+z6hcusr44uHraAAZFd +d8q65+2XuQllFoDufHRx/HnwJQyYGwnwZakdVeyNqTg0DFh0lWSb2S1/MmXm7mvO +Jjqlz0eC2rINOgw5Q4E4vX4G0In3zMteHrIQq9h8T6LTm/H4fnCfvLZkY8aocaze +xfqisq5iKUTUQIup5dDWSmfuZKf1fKRuZOmyVl/xehsGouKvclB346t/u43KMx7j +oPhvBMtRWXeX9GTRDvCKvBqh8O+1CWB4NBzIinAZmDuXsoW/GUhWr7uRlcor3pqC +sYSgPV3UbmWfdCWrS/Dq77S/I/+Mq6+S5B3nAAWbSLwKZKvWe3RDl1vyLWszk2RY +wfCjsrsTTYb7yIraqdd+3V9TOtIsZMicg8z8AHynauZJCMCPqYu87MT8m42hp+Cg +kHOBUZ3U8sUtT5czpIh+HxKdhT20YUjRS/BZFLqcxum57Btc10QJwyk+7Shxhc4n +ZjhETnlmrj+ukg2Ek6+H0Vt/7xYp76R54U8NlVDq61pRdMx1DoSpqqpKJ6Y+4RxH +3Ch62ywxasgiYkS+J0wv7gF2i80BZuojH2jn2FQTN5PU3ANPNtjB4tw3wmzpPpVI +IpihdiY8AXBMWoWmm5EzdkF1g5SvNSL6ASwYS4jEeyF7rFOJ+2SDIs7BTQRnGam4 +ARAAvRzNrel+FAbzYR4ks8enHpafbsujW6U7t5v+f9IABi1+Hynt+idByhGN05HS +n/183rZ2gcAuhjWu56QRQoS5eYd8Uxer/iE99FIRpbvhpDRRDgeAscEJmmuGlQGY +XoLI7Nc9ZytSW6qBcfKXSQLZdiatGitt8Y8LJ0qvgJaGxjPC5YWXIZ+DbITYGPKd +Jd3gpRSa0KBQfVHVFV7nLW85rIw1x9srgiobccO3OdHtUdqt0ls9957NirB51P7r +nSmvgbv/9KuziY09n5G4ZGDDrlj1tWaK7Rjdrflz38F14/iFUgQFugVs+KBcCNbP +0evIkZoB0ElmsZVY3LYtF0FKBDB3Fz4ye+Qn2dgoe6QeMEWFFgxK/UquxgJYKir1 +TwC15JV2CF4dIJObq9bjsV+cDDK21px2fsnexLP3sSZBShjIF0QlToI6j3+wW+eC +WreE8LTOMk1vqv3KyaMoNNTQ4aZQmnH2BNpFQOpM0rtU7x2pIxRXjW/VxNL0Yd4Z +kxyeSviF4yRQiPmze6KePnxH2XKPJr/+++XqQHA9ir4grgXrc6fe/ZLJHfwvKL0O +MMdjmF5ihX7Wexqw+/L31XTu/UeAVwG+kRqE8VTqhrMRvGj6Jd4aKpeDMGxPOwiC +C1l47xaHsPdC24aReOjKMKdU6iNbPKkCensTKbt5Gy6zxaUAEQEAAcLBfAQYAQoA +JhYhBDqyhSMsRq5D2OGS9Nqw946m5+LSBQJnGam4AhsMBQkDwmcAAAoJENqw946m +5+LS0aQP+gLazR/OoMvnHD9Khp1n/yOeMBLRaOE516WPJtGN3G5xwQYuH9/sy/jf +snuUyYR88uRvw3LPIezVP/ohSTkN6NlR1m+aW+K3sGAdTukvhcje3RZKy/TE3YoQ +LQmghMwxxLZbiUmNd24ii1IzJ8V/VnSorLZloaLllYoGNsMJiARspeCLP64gv0AS +L3iQe2oO7x7ctTNWUMO9KkOKrdkEQ0ldbAiEzaPlOA6QU1yLuRkLL0AabXfiHslF +kIuLnlkiQpuSQQShMVxPWWq8D5buPJCeMuOYRNgcPJknfbuh+LRsGaV3JyH/VCVI +qMjI1xUMNLe/A6HUPk6FvV3LCPXtkNQh8hZ1Prtp2aGbWQCRPmuEVqyQgte1nFuV +aQwwFxPniWFj2Tgki+072sIb7dr60eXLY0cGWkoN9PLBx/fHCBrmw8rcvpmOjvMM +riVXne/o1S+XGfwCghyxUl8sNYZ0UGRYLWyiD4G30aYChdQtI0GrXHfydzwWfxwv +s6LkMcny6nInJO3j2Nw18jcp/S60DBSixtnHWozCW7AVb+p5VwxVhaCgA8+K9CAZ +a6Ji2VLCh+rUAQowFuKoPhvyqW5LW2YWoMUEQu8F4l0kt8LFwK4m+YlWHkm1NKDV +D/Vc7l/6caFG9msCbM8LVH03v/0T6hzvMgAcibDlX0lyVUfq7ka6 +=8TTy +-----END PGP PUBLIC KEY BLOCK----- diff --git a/setxkbmap.spec b/setxkbmap.spec index 81efccc..fc09485 100644 --- a/setxkbmap.spec +++ b/setxkbmap.spec @@ -6,8 +6,11 @@ Summary: X11 keymap client License: HPND URL: https://www.x.org Source0: https://www.x.org/pub/individual/app/setxkbmap-%{version}.tar.xz +Source1: %{name}-%{version}.tar.xz.sig +Source2: 3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.asc BuildRequires: gcc +BuildRequires: gnupg2 BuildRequires: make BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xkbfile) @@ -23,6 +26,7 @@ specified keyboard to use the layout determined by the options listed on the command line. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup %build diff --git a/sources b/sources index 81a43e3..597942a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setxkbmap-1.3.5.tar.xz) = 57a7e4c0331f81e6e61240f0da69d536e0838c46191f789b7b2ca3a6a5a3d0169a28b71e108bbcf8d24d10068c63a7f65eb9196a3774dbd8a00db9ecc0df46a0 +SHA512 (setxkbmap-1.3.5.tar.xz.sig) = e491f68e8bd19710cf06548ae28e9150e6966c462a1e5d79d95e7a16ba038c1d6d4089e8655ebfdee4ad3294b85774410f0a95b59855325081ab1179f0e2a188 From 35c2cbd0c62bdfabb7d2e935338091953dd38d38 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 31 Mar 2026 15:04:32 -0300 Subject: [PATCH 5/7] upload source files --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 597942a..e2968d7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (setxkbmap-1.3.5.tar.xz) = 57a7e4c0331f81e6e61240f0da69d536e0838c46191f789b7b2ca3a6a5a3d0169a28b71e108bbcf8d24d10068c63a7f65eb9196a3774dbd8a00db9ecc0df46a0 SHA512 (setxkbmap-1.3.5.tar.xz.sig) = e491f68e8bd19710cf06548ae28e9150e6966c462a1e5d79d95e7a16ba038c1d6d4089e8655ebfdee4ad3294b85774410f0a95b59855325081ab1179f0e2a188 From 8a14bcd6bf5ec2c625190ccc09c6f4e01f1b944f Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sun, 14 Jun 2026 01:18:02 -0300 Subject: [PATCH 6/7] spec cleanup and modernization Signed-off-by: Filipe Rosset --- setxkbmap.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setxkbmap.spec b/setxkbmap.spec index fc09485..fb6c1f5 100644 --- a/setxkbmap.spec +++ b/setxkbmap.spec @@ -5,12 +5,12 @@ Summary: X11 keymap client License: HPND URL: https://www.x.org -Source0: https://www.x.org/pub/individual/app/setxkbmap-%{version}.tar.xz -Source1: %{name}-%{version}.tar.xz.sig +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: 3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.asc BuildRequires: gcc -BuildRequires: gnupg2 +BuildRequires: gpgverify BuildRequires: make BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xkbfile) @@ -36,6 +36,9 @@ on the command line. %install %make_install +%check +make check + %files %license COPYING %{_bindir}/setxkbmap From 976b5d5836130e9e66333548696a6027e6803845 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:26:11 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild