diff --git a/README.md b/README.md deleted file mode 100644 index 7342728d557c602f51c6d278bba9f3dd9faaf356..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -Anolis OS -======================================= -# 代码仓库说明 -## 分支说明 ->进行代码开发工作时,请注意选择当前版本对应的分支 -* aX分支为对应大版本的主分支,如a8分支对应当前最新版本 -* aX.Y分支为对应小版本的维护分支,如a8.2分支对应8.2版本 -## 开发流程 -1. 首先fork目标分支到自己的namespace -2. 在自己的fork分支上做出修改 -3. 向对应的仓库中提交merge request,源分支为fork分支 diff --git a/libxkbcommon-1.4.0.tar.xz b/libxkbcommon-1.4.0.tar.xz deleted file mode 100644 index ed10cac93df49e0de9262f317dd24aa4c5c74c95..0000000000000000000000000000000000000000 Binary files a/libxkbcommon-1.4.0.tar.xz and /dev/null differ diff --git a/libxkbcommon-1.7.0.tar.xz b/libxkbcommon-1.7.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..fabd5b573bc86a232abacaa294ca004163c94812 Binary files /dev/null and b/libxkbcommon-1.7.0.tar.xz differ diff --git a/libxkbcommon.spec b/libxkbcommon.spec index 1bd1047c9a065b5c157a2e6cca40b616c5fbb470..4d74321ec5bbc96bb5888f13a0cf5735a32befb0 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -1,24 +1,22 @@ -%define anolis_release 3 +%define anolis_release 1 Name: libxkbcommon -Version: 1.4.0 +Version: 1.7.0 Release: %{anolis_release}%{?dist} Summary: X.Org X11 XKB parsing library -License: MIT -URL: http://xkbcommon.org/ -Source0: http://xkbcommon.org/download/%{name}-%{version}.tar.xz +License: MIT AND X11 AND MIT-CMU +URL: http://www.x.org -BuildRequires: git -BuildRequires: meson -BuildRequires: xorg-x11-util-macros -BuildRequires: xorg-x11-proto-devel -BuildRequires: libX11-devel +Source0: https://xkbcommon.org/download/%{name}-%{version}.tar.xz + +BuildRequires: gcc +BuildRequires: git meson +BuildRequires: byacc flex bison +BuildRequires: xorg-x11-proto-devel libX11-devel +BuildRequires: pkgconfig(wayland-client) pkgconfig(wayland-protocols) BuildRequires: xkeyboard-config-devel -BuildRequires: byacc -BuildRequires: flex -BuildRequires: bison -BuildRequires: pkgconfig(xcb-xkb) +BuildRequires: pkgconfig(xcb-xkb) >= 1.10 BuildRequires: libxml2-devel Requires: xkeyboard-config @@ -56,18 +54,29 @@ Requires: %{name} = %{version}-%{release} %description utils %{name}-utils is a set of utilities to analyze and test XKB parsing. +%package x11-utils +Summary: X.Org X11 XKB parsing utilities +Requires: %{name} = %{version}-%{release} +Requires: %{name}-x11 = %{version}-%{release} +Requires: %{name}-utils = %{version}-%{release} + +%description x11-utils +%{name}-x11-utils is a set of X11 utilities to analyze and test XKB parsing. + %prep -%setup -q +%autosetup -S git %build %meson -Denable-docs=false \ -Denable-x11=true \ - -Denable-wayland=false + -Denable-wayland=true %meson_build %install %meson_install +%ldconfig_scriptlets + %generate_compatibility_deps %files @@ -81,10 +90,18 @@ Requires: %{name} = %{version}-%{release} %files devel %{_libdir}/libxkbcommon.so %{_libdir}/libxkbregistry.so -%{_includedir}/xkbcommon/* +%dir %{_includedir}/xkbcommon/ +%{_includedir}/xkbcommon/xkbcommon.h +%{_includedir}/xkbcommon/xkbcommon-compat.h +%{_includedir}/xkbcommon/xkbcommon-compose.h +%{_includedir}/xkbcommon/xkbcommon-keysyms.h +%{_includedir}/xkbcommon/xkbcommon-names.h +%{_includedir}/xkbcommon/xkbregistry.h %{_libdir}/pkgconfig/xkbcommon.pc %{_libdir}/pkgconfig/xkbregistry.pc +%ldconfig_scriptlets x11 + %files x11 %{_libdir}/libxkbcommon-x11.so.* %{abidir}/libxkbcommon-x11.dump @@ -97,10 +114,29 @@ Requires: %{name} = %{version}-%{release} %files utils %{_bindir}/xkbcli %{abidir}/xkbcli-option.list -%{_libexecdir}/xkbcommon/xkbcli* -%{_mandir}/man1/xkbcli*.1.zst +%{_libexecdir}/xkbcommon/xkbcli-compile-compose +%{_libexecdir}/xkbcommon/xkbcli-compile-keymap +%{_libexecdir}/xkbcommon/xkbcli-how-to-type +%{_libexecdir}/xkbcommon/xkbcli-interactive-evdev +%{_libexecdir}/xkbcommon/xkbcli-interactive-wayland +%{_libexecdir}/xkbcommon/xkbcli-list +%{_mandir}/man1/xkbcli-compile-compose.1.zst +%{_mandir}/man1/xkbcli-compile-keymap.1.zst +%{_mandir}/man1/xkbcli-how-to-type.1.zst +%{_mandir}/man1/xkbcli-interactive-evdev.1.zst +%{_mandir}/man1/xkbcli-interactive-wayland.1.zst +%{_mandir}/man1/xkbcli-list.1.zst +%{_mandir}/man1/xkbcli.1.zst +%{_datadir}/bash-completion/completions/xkbcli + +%files x11-utils +%{_libexecdir}/xkbcommon/xkbcli-interactive-x11 +%{_mandir}/man1/xkbcli-interactive-x11.1.zst %changelog +* Tue Feb 25 2025 wangzhe - 1.7.0-1 +- Refer to CentOS Stream libxkbcommon-1.7.0-4 (tdawson@redhat.com) + * Thu Nov 16 2023 Wenlong Zhang - 1.4.0-3 - fix build error for libxkbcommon