diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 006a377..8482556 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,5 +1,5 @@ Name: xkeyboard-config -Version: 2.34 +Version: 2.35.1 Release: 1mamba Summary: X Keyboard Configuration Database Group: System/X11 @@ -7,15 +7,15 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ -Source: ftp://ftp.x.org/pub/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.bz2 +Source: ftp://ftp.x.org/pub/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.xz License: MIT BuildArch: noarch ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END Provides: xkbdata -Obsoletes: xkbdata +Obsoletes: xkbdata < 2.35.1 Provides: xorg-xkbdata -Obsoletes: xorg-xkbdata +Obsoletes: xorg-xkbdata < 2.35.1 %description The non-arch keyboard configuration database for X Window. The goal is to provide the consistent, well-structured, frequently released open source of X keyboard configuration data for X Window System implementations (free, open source and commercial). The project is targeted to XKB-based systems. @@ -27,22 +27,24 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description devel The non-arch keyboard configuration database for X Window. The goal is to provide the consistent, well-structured, frequently released open source of X keyboard configuration data for X Window System implementations (free, open source and commercial). The project is targeted to XKB-based systems. -This package contains static libraries and header files need for development. +This package contains static libraries and header files needed for development. + +#% debug_package %prep %setup -q %build -%configure \ - --with-xkb-base=%{_datadir}/X11/xkb \ - --with-xkb-rules-symlink=xorg \ - --enable-compat-rules=yes +%meson \ + -Dxkb-base="%{_datadir}/X11/xkb" \ + -Dxorg-rules-symlinks=true \ + -Dcompat-rules=true -%make +%meson_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%meson_install %find_lang %{name} @@ -67,6 +69,9 @@ exit 0 %doc ChangeLog NEWS README %changelog +* Sat Apr 16 2022 Silvan Calarco 2.35.1-1mamba +- update to 2.35.1 + * Tue Oct 05 2021 Automatic Build System 2.34-1mamba - automatic version update by autodist