1
0
forked from pool/libxkbcommon

- Update to release 0.9.0

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=52
This commit is contained in:
Jan Engelhardt 2019-10-20 16:14:44 +00:00 committed by Git OBS Bridge
parent 6da0815f2c
commit 587e1a500c
4 changed files with 26 additions and 30 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b
size 648592

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a51885adff1f6207ad291a57c41919048fb4e5ec5b19e8e17b8c0e9a7a2746fc
size 376160

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Oct 20 15:08:58 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to release 0.9.0
* Move ~/.xkb to before XKB_CONFIG_ROOT. This enables the user
to have full control of the keymap definitions, instead of
only augmenting them.
-------------------------------------------------------------------
Fri Feb 22 21:58:27 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -23,7 +23,7 @@
%endif
Name: libxkbcommon
Version: 0.8.4
Version: 0.9.0
Release: 0
Summary: Library for handling xkb descriptions
License: MIT
@ -33,14 +33,14 @@ Url: http://xkbcommon.org/
#Git-Clone: git://github.com/xkbcommon/libxkbcommon
Source: https://xkbcommon.org/download/%name-%version.tar.xz
Source2: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#git#BuildRequires: autoconf >= 2.62
#git#BuildRequires: automake
BuildRequires: bison
BuildRequires: flex
#git#BuildRequires: libtool >= 2
BuildRequires: pkgconfig
BuildRequires: meson
BuildRequires: pkg-config
BuildRequires: xz
BuildRequires: pkgconfig(wayland-client) >= 1.2.0
BuildRequires: pkgconfig(wayland-protocols) >= 1.7
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xproto)
@ -113,24 +113,16 @@ in %name-x11-0.
%setup -q
%build
if [ ! -e configure ]; then
NOCONFIGURE=1 ./autogen.sh
fi
%if %{with x11}
extra_opts=--enable-x11
ef=-Denable-x11=true
%else
extra_opts=--disable-x11
ef=-Denable-x11=false
%endif
# Ensure people will use pkgconfig to locate headers.
%configure --disable-static --includedir="%_includedir/%name" $extra_opts
make %{?_smp_mflags} V=1
%meson -Denable-docs=false --includedir="%_includedir/%name" $ef
%meson_build
%install
%make_install
rm -f "%buildroot/%_libdir"/*.la
%check
make check
%meson_install
%post -n libxkbcommon0 -p /sbin/ldconfig
%postun -n libxkbcommon0 -p /sbin/ldconfig
@ -138,13 +130,11 @@ make check
%postun -n libxkbcommon-x11-0 -p /sbin/ldconfig
%files -n libxkbcommon0
%defattr(-,root,root)
%doc LICENSE NEWS
%license LICENSE
%_libdir/libxkbcommon.so.*
%files devel
%defattr(-,root,root)
%doc LICENSE NEWS
%doc NEWS
%_includedir/%name/
%if %{with x11}
%exclude %_includedir/%name/xkbcommon/xkbcommon-x11.h
@ -154,13 +144,11 @@ make check
%if %{with x11}
%files -n libxkbcommon-x11-0
%defattr(-,root,root)
%doc LICENSE NEWS
%license LICENSE
%_libdir/libxkbcommon-x11.so.*
%files x11-devel
%defattr(-,root,root)
%doc LICENSE NEWS
%license LICENSE
%dir %_includedir/%name
%dir %_includedir/%name/xkbcommon
%_includedir/%name/xkbcommon/xkbcommon-x11.h