From 1912d85f887fb17528960c2a9b01b2bcc6a8b99a60c19100c164914942db125a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 6 Sep 2020 19:43:46 +0000 Subject: [PATCH 1/2] - Update to release 1.0.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=57 --- libxkbcommon-0.10.0.tar.xz | 3 --- libxkbcommon-1.0.0.tar.xz | 3 +++ libxkbcommon.changes | 13 +++++++++++ libxkbcommon.spec | 47 +++++++++++++++++++++++++++++++++++--- 4 files changed, 60 insertions(+), 6 deletions(-) delete mode 100644 libxkbcommon-0.10.0.tar.xz create mode 100644 libxkbcommon-1.0.0.tar.xz diff --git a/libxkbcommon-0.10.0.tar.xz b/libxkbcommon-0.10.0.tar.xz deleted file mode 100644 index 7cd3775..0000000 --- a/libxkbcommon-0.10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2 -size 383788 diff --git a/libxkbcommon-1.0.0.tar.xz b/libxkbcommon-1.0.0.tar.xz new file mode 100644 index 0000000..f87958e --- /dev/null +++ b/libxkbcommon-1.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41411ad253b99f59978b4c7b369ba0979b2301c0499a105a399445a56eb7621f +size 408052 diff --git a/libxkbcommon.changes b/libxkbcommon.changes index e4a51a2..df9b3a3 100644 --- a/libxkbcommon.changes +++ b/libxkbcommon.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Sep 6 19:33:06 UTC 2020 - Jan Engelhardt + +- Update to release 1.0.0 + * Now it is possible to add custom layouts and options at the + system (/etc) and user (~/.config) level, at least when + libxkbcommon is in use. + * libxkbregistry is a C library that lists available XKB + models, layouts and variants for a given ruleset. This is a + separate library (.so/.pc files) and aimed at tools that + provide a listing of available keyboard layouts to the user. + * Add an `xkbcli` command-line utility. + ------------------------------------------------------------------- Sun Jan 19 00:48:54 UTC 2020 - Jan Engelhardt diff --git a/libxkbcommon.spec b/libxkbcommon.spec index eede6aa..c06fc4c 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -23,7 +23,7 @@ %endif Name: libxkbcommon -Version: 0.10.0 +Version: 1.0.0 Release: 0 Summary: Library for handling xkb descriptions License: MIT @@ -35,9 +35,10 @@ Source: https://xkbcommon.org/download/%name-%version.tar.xz Source2: baselibs.conf BuildRequires: bison BuildRequires: flex -BuildRequires: meson +BuildRequires: meson >= 0.49 BuildRequires: pkg-config BuildRequires: xz +BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(wayland-client) >= 1.2.0 BuildRequires: pkgconfig(wayland-protocols) >= 1.7 BuildRequires: pkgconfig(wayland-scanner) @@ -96,6 +97,12 @@ Wayland and kmscon. This package contains the development headers for the library found in libxkbcommon. +%package tools +Summary: Utilities from xkbcommon +Group: System/X11/Utilities + +%description tools + %package x11-devel Summary: Development files for the libxkbcommon-x11 library Group: Development/Libraries/C and C++ @@ -109,8 +116,27 @@ users make sense of their keyboard input. This package contains the development headers for the library found in %name-x11-0. +%package -n libxkbregistry0 +Summary: Library for handling xkb descriptions +Group: System/Libraries + +%description -n libxkbregistry0 +libxkbregistry is a C library that lists available XKB models, +layouts and variants for a given ruleset. + +%package -n libxkbregistry-devel +Summary: Header files for xkbregistry +Group: Development/Libraries/C and C++ + +%description -n libxkbregistry-devel +libxkbregistry is a C library that lists available XKB models, +layouts and variants for a given ruleset. + +This is aimed at tools that provide a listing of available keyboard +layouts to the user. + %prep -%setup -q +%autosetup -p1 %build %if %{with x11} @@ -118,6 +144,7 @@ ef=-Denable-x11=true %else ef=-Denable-x11=false %endif +# bugzilla.opensuse.org/795968 for rationale %meson -Denable-docs=false --includedir="%_includedir/%name" $ef %meson_build @@ -128,6 +155,8 @@ ef=-Denable-x11=false %postun -n libxkbcommon0 -p /sbin/ldconfig %post -n libxkbcommon-x11-0 -p /sbin/ldconfig %postun -n libxkbcommon-x11-0 -p /sbin/ldconfig +%post -n libxkbregistry0 -p /sbin/ldconfig +%postun -n libxkbregistry0 -p /sbin/ldconfig %files -n libxkbcommon0 %license LICENSE @@ -142,6 +171,11 @@ ef=-Denable-x11=false %_libdir/libxkbcommon.so %_libdir/pkgconfig/xkbcommon.pc +%files tools +%_bindir/xkbcli +%_libexecdir/xkbcommon/ +%_mandir/man1/xkbcli* + %if %{with x11} %files -n libxkbcommon-x11-0 %license LICENSE @@ -156,4 +190,11 @@ ef=-Denable-x11=false %_libdir/pkgconfig/xkbcommon-x11.pc %endif +%files -n libxkbregistry0 +%_libdir/libxkbregistry.so.0* + +%files -n libxkbregistry-devel +%_libdir/libxkbregistry.so +%_libdir/pkgconfig/xkbregistry.pc + %changelog From 2d6c6c11de11f994c58477e9b44db8a9ed6e040542a6660add3d78178e6c6834 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 7 Sep 2020 07:19:27 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=58 --- libxkbcommon.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libxkbcommon.spec b/libxkbcommon.spec index c06fc4c..aad1d53 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -102,6 +102,7 @@ Summary: Utilities from xkbcommon Group: System/X11/Utilities %description tools +xkbcommon tools for introspectino and debugging. %package x11-devel Summary: Development files for the libxkbcommon-x11 library