libxkbcommon: update to 1.6.0
This commit is contained in:
Dan Streetman
Родитель
4cab101596
Коммит
45cc06d0fa
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"libxkbcommon-1.5.0.tar.xz": "560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017"
|
||||
}
|
||||
"Signatures": {
|
||||
"libxkbcommon-1.6.0.tar.xz": "0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +1,20 @@
|
|||
%define required_wayland_version 1.2.0
|
||||
%define required_wayland_protocols_version 1.7
|
||||
|
||||
Summary: X.Org X11 XKB parsing library
|
||||
Name: libxkbcommon
|
||||
Version: 1.5.0
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
Version: 1.6.0
|
||||
Release: 2%{?dist}
|
||||
Summary: X.Org X11 XKB parsing library
|
||||
License: MIT AND X11 AND MIT-CMU
|
||||
URL: http://www.x.org
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
URL: https://www.x.org
|
||||
Source0: https://xkbcommon.org/download/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: git
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libxml2-devel
|
||||
Source0: https://xkbcommon.org/download/%{name}-%{version}.tar.xz
|
||||
BuildRequires: gcc
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: byacc flex bison
|
||||
BuildRequires: xorg-x11-proto-devel libX11-devel
|
||||
BuildRequires: xkeyboard-config-devel
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: xorg-x11-util-macros
|
||||
BuildRequires: pkgconfig(wayland-client) >= %{required_wayland_version}
|
||||
BuildRequires: pkgconfig(wayland-protocols) >= %{required_wayland_protocols_version}
|
||||
BuildRequires: pkgconfig(wayland-scanner) >= %{required_wayland_version}
|
||||
BuildRequires: pkgconfig(xcb-xkb) >= 1.10
|
||||
BuildRequires: libxml2-devel
|
||||
|
||||
Requires: xkeyboard-config
|
||||
|
||||
|
|
@ -34,7 +24,6 @@ the X Server or other display servers.
|
|||
|
||||
%package devel
|
||||
Summary: X.Org X11 XKB parsing development package
|
||||
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -42,7 +31,6 @@ X.Org X11 XKB parsing development package
|
|||
|
||||
%package x11
|
||||
Summary: X.Org X11 XKB keymap creation library
|
||||
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description x11
|
||||
|
|
@ -51,7 +39,6 @@ server.
|
|||
|
||||
%package x11-devel
|
||||
Summary: X.Org X11 XKB keymap creation library
|
||||
|
||||
Requires: %{name}-x11%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description x11-devel
|
||||
|
|
@ -59,29 +46,24 @@ X.Org X11 XKB keymap creation library development package
|
|||
|
||||
%package utils
|
||||
Summary: X.Org X11 XKB parsing utilities
|
||||
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description utils
|
||||
%{name}-utils is a set of utilities to analyze and test XKB parsing.
|
||||
|
||||
%prep
|
||||
%autosetup -S git
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
%meson --buildtype=release \
|
||||
-Denable-docs=false \
|
||||
-Denable-x11=true
|
||||
%meson -Denable-docs=false \
|
||||
-Denable-x11=true \
|
||||
-Denable-wayland=false
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
# Removing documentation
|
||||
rm -r %{buildroot}%{_mandir}/man1
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
|
|
@ -103,8 +85,7 @@ rm -r %{buildroot}%{_mandir}/man1
|
|||
%{_libdir}/pkgconfig/xkbcommon.pc
|
||||
%{_libdir}/pkgconfig/xkbregistry.pc
|
||||
|
||||
%post x11 -p /sbin/ldconfig
|
||||
%postun x11 -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets x11
|
||||
|
||||
%files x11
|
||||
%{_libdir}/libxkbcommon-x11.so.0.0.0
|
||||
|
|
@ -120,29 +101,79 @@ rm -r %{buildroot}%{_mandir}/man1
|
|||
%{_libexecdir}/xkbcommon/xkbcli-compile-keymap
|
||||
%{_libexecdir}/xkbcommon/xkbcli-how-to-type
|
||||
%{_libexecdir}/xkbcommon/xkbcli-interactive-evdev
|
||||
%{_libexecdir}/xkbcommon/xkbcli-interactive-wayland
|
||||
%{_libexecdir}/xkbcommon/xkbcli-interactive-x11
|
||||
%{_libexecdir}/xkbcommon/xkbcli-list
|
||||
%{_mandir}/man1/xkbcli-compile-keymap.1.gz
|
||||
%{_mandir}/man1/xkbcli-how-to-type.1.gz
|
||||
%{_mandir}/man1/xkbcli-interactive-evdev.1.gz
|
||||
%{_mandir}/man1/xkbcli-interactive-x11.1.gz
|
||||
%{_mandir}/man1/xkbcli-list.1.gz
|
||||
%{_mandir}/man1/xkbcli.1.gz
|
||||
%{_datadir}/bash-completion/completions/xkbcli
|
||||
|
||||
%changelog
|
||||
* Fri Oct 27 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.5.0-1
|
||||
- Auto-upgrade to 1.5.0 - Azure Linux 3.0 - package upgrades
|
||||
* Sun Feb 04 2024 Dan Streetman <ddstreet@ieee.org> - 1.6.0-2
|
||||
- Update to version from Fedora 39.
|
||||
- Next line is present only to avoid tooling failures, and does not indicate the actual package license.
|
||||
- Initial CBL-Mariner import from Fedora 39 (license: MIT).
|
||||
- license verified
|
||||
- remove git as build dep, as we don't need to use autpsetup -S git
|
||||
|
||||
* Fri Apr 22 2022 Olivia Crain <oliviacrain@microsoft.com> - 1.0.1-4
|
||||
- Remove explicit pkgconfig provides that are now automatically generated by RPM
|
||||
* Mon Oct 09 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.6.0-1
|
||||
- libxkbcommon 1.6.0
|
||||
|
||||
* Mon Aug 30 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.1-3
|
||||
- Removing BR on 'marinerui-rpm-macros'. Using macros from the build env.
|
||||
* Tue Sep 05 2023 Peter Hutterer <peter.hutterer@redhat.com>
|
||||
- SPDX migration: update to SPDX license identifiers
|
||||
|
||||
* Mon Jan 18 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.1-2
|
||||
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
|
||||
- License verified.
|
||||
- Added build-time dependency on 'marinerui-rpm-macros'.
|
||||
- Added explicit "Provides" for "pkgconfig(*)".
|
||||
- Enabled 'wayland' in the build config - added the new 'xkbcli-interactive-wayland' to *-utils subpackage.
|
||||
- Removed documentation.
|
||||
- Removed unused build-time dependency on 'byacc'.
|
||||
- Replaced ldconfig scriptlets with explicit calls to ldconfig.
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jan 04 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.5.0-1
|
||||
- libxbkcommon 1.5.0
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon May 23 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.4.1-1
|
||||
- libxkbcommon 1.4.1
|
||||
|
||||
* Mon Feb 07 2022 Peter Hutterer <peter.hutterer@redhat.com> 1.4.0-1
|
||||
- libxkbcommon 1.4.0
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Sep 13 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.3.1-1
|
||||
- libxkbcommon 1.3.1
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue May 04 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.3.0-1
|
||||
- libxkbcommon 1.3.0
|
||||
|
||||
* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.2.1-1
|
||||
- libxkbcommon 1.2.1
|
||||
|
||||
* Tue Apr 06 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.2.0-1
|
||||
- libxkbcommon 1.2.0
|
||||
- Fix Source link
|
||||
|
||||
* Wed Mar 10 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.1.0-1
|
||||
- libxkbcommon 1.1.0
|
||||
- remove the git snapshot handling, we haven't used it in 9 years
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Nov 24 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.0.3-1
|
||||
- libxkbcommon 1.0.3
|
||||
|
||||
* Mon Nov 23 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.0.2-1
|
||||
- libxkbcommon 1.0.2
|
||||
|
||||
* Fri Sep 11 2020 Pete Walter <pwalter@fedoraproject.org> - 1.0.1-1
|
||||
- libxkbcommon 1.0.1
|
||||
|
|
|
|||
|
|
@ -11671,8 +11671,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "libxkbcommon",
|
||||
"version": "1.5.0",
|
||||
"downloadUrl": "https://xkbcommon.org/download/libxkbcommon-1.5.0.tar.xz"
|
||||
"version": "1.6.0",
|
||||
"downloadUrl": "https://xkbcommon.org/download/libxkbcommon-1.6.0.tar.xz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче