diff --git a/.gitignore b/.gitignore index 7d23548..cc47481 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xkeyboard-config-2.28.tar.bz2 +xkeyboard-config-2.41.tar.xz diff --git a/.xkeyboard-config.metadata b/.xkeyboard-config.metadata deleted file mode 100644 index 3062a6a..0000000 --- a/.xkeyboard-config.metadata +++ /dev/null @@ -1 +0,0 @@ -f521cd49ab04f54778779dddc68e1771de2e8fbb SOURCES/xkeyboard-config-2.28.tar.bz2 diff --git a/sources b/sources new file mode 100644 index 0000000..9a9d480 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xkeyboard-config-2.41.tar.xz) = 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a diff --git a/SPECS/xkeyboard-config.spec b/xkeyboard-config.spec similarity index 65% rename from SPECS/xkeyboard-config.spec rename to xkeyboard-config.spec index f66f360..b819740 100644 --- a/SPECS/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -6,9 +6,9 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 2.28 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: MIT +Version: 2.41 +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: HPND AND HPND-sell-variant AND X11 AND X11-distribute-modifications-variant AND MIT AND MIT-open-group AND xkeyboard-config-Zinoviev URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig %if 0%{?gitdate} @@ -16,13 +16,13 @@ Source0: %{name}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh Source2: commitid %else -Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz %endif BuildArch: noarch BuildRequires: gettext gettext-devel -BuildRequires: libtool +BuildRequires: meson BuildRequires: libxslt BuildRequires: perl(XML::Parser) BuildRequires: pkgconfig(glib-2.0) @@ -30,11 +30,7 @@ BuildRequires: pkgconfig(x11) >= 1.4.3 BuildRequires: pkgconfig(xorg-macros) >= 1.12 BuildRequires: pkgconfig(xproto) >= 7.0.20 BuildRequires: xkbcomp -BuildRequires: git - -%if 0%{?gitdate} BuildRequires: git-core -%endif %description This package contains configuration data used by the X Keyboard Extension (XKB), @@ -52,20 +48,15 @@ Development files for %{name}. %autosetup -S git %build -autoreconf -v --force --install || exit 1 -%configure \ - --enable-compat-rules \ - --with-xkb-base=%{_datadir}/X11/xkb \ - --with-xkb-rules-symlink=xorg - -make %{?_smp_mflags} +%meson -Dcompat-rules=true -Dxorg-rules-symlinks=true +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%meson_install # Remove unnecessary symlink rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled -%find_lang %{name} +%find_lang %{name} # Create filelist { @@ -77,18 +68,129 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled } %files -f files.list -f %{name}.lang -%doc AUTHORS README NEWS TODO COPYING docs/README.* docs/HOWTO.* +%doc AUTHORS README NEWS COPYING docs/README.* docs/HOWTO.* +%{_mandir}/man7/xkeyboard-config.* %{_datadir}/X11/xkb/rules/xorg %{_datadir}/X11/xkb/rules/xorg.lst %{_datadir}/X11/xkb/rules/xorg.xml -%{_mandir}/man7/xkeyboard-config.* %files devel %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog -* Tue Oct 29 2019 Peter Hutterer 2.28-1 -- xkeyboard-config 2.28 (#1728817) +* Tue Oct 29 2024 Troy Dawson - 2.41-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 2.41-2 +- Bump release for June 2024 mass rebuild + +* Wed Feb 07 2024 Peter Hutterer - 2.41-1 +- xkeyboard-config 2.41 + +* Sat Jan 27 2024 Fedora Release Engineering - 2.40-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Nov 29 2023 Peter Hutterer - 2.40-2 +- SPDX migration + +* Fri Oct 13 2023 Peter Hutterer - 2.40-1 +- xkeyboard-config 2.40 + +* Sat Jul 22 2023 Fedora Release Engineering - 2.39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 12 2023 Peter Hutterer - 2.39-1 +- xkeyboard-config 2.39 + +* Tue Feb 07 2023 Peter Hutterer - 2.38-1 +- xkeyboard-config 2.38 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.36-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Nov 26 2022 Davide Cavalca - 2.36-3 +- Backport upstream MR to allow Apple MacBook keyboards to type \ properly + +* Sat Jul 23 2022 Fedora Release Engineering - 2.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jun 16 2022 Peter Hutterer - 2.36-1 +- xkeyboard-config 2.36 + +* Wed Feb 09 2022 Peter Hutterer - 2.35.1-1 +- xkeyboard-config 2.35.1 + +* Sat Jan 22 2022 Fedora Release Engineering - 2.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Oct 07 2021 Peter Hutterer - 2.34-1 +- xkeyboard-config 2.34 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 22 2021 Peter Hutterer 2.33-3 +- xkeyboard-config 2.33 + +* Tue Apr 20 2021 Peter Hutterer 2.32-3 +- Restore the xorg ruleset, console-setup and possibly others are still + using those (#1951459) + +* Fri Apr 09 2021 Peter Hutterer 2.32-2 +- Allow for a "custom" layout + +* Tue Feb 16 2021 Peter Hutterer 2.32-1 +- xkeyboard-config 2.32 +- build with meson now +- drop the xorg ruleset, no longer in use. Everything is hardcoded to evdev + these days. + +* Thu Jan 28 2021 Fedora Release Engineering - 2.31-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 01 2020 Peter Hutterer 2.31-3 +- Add make to BuildRequires + +* Wed Nov 04 2020 Peter Hutterer 2.31-2 +- Fix BuildRequires for git, we only need git-core + +* Wed Oct 07 2020 Peter Hutterer 2.31-1 +- xkeyboard-config 2.31 + +* Wed Jul 29 2020 Fedora Release Engineering - 2.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 19 2020 Peter Hutterer 2.30-2 +- Fix a syntax error in the indian symbols file + +* Wed Jun 03 2020 Peter Hutterer 2.30-1 +- xkeyboard-config 2.30 + +* Fri Jan 31 2020 Peter Hutterer 2.29-1 +- xkeyboard-config 2.29 + +* Fri Oct 25 2019 Peter Hutterer 2.28-1 +- xkeyboard-config 2.28 + +* Sat Jul 27 2019 Fedora Release Engineering - 2.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jun 13 2019 Peter Hutterer 2.27-1 +- xkeyboard-config 2.27 +- drop intltool, no longer needed, see upstream commit e8026f673e + +* Mon May 27 2019 Peter Hutterer 2.26-2 +- xkeyboard-config 2.26, with sources this time + +* Mon May 27 2019 Peter Hutterer 2.26-1 +- xkeyboard-config 2.26 + +* Sun Feb 03 2019 Fedora Release Engineering - 2.24-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Fri Jul 06 2018 Peter Hutterer 2.24-3 - Remove high-keycode removal patches, xkbcomp 1.4.2 has been in stable for