X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libinput.spec;h=7de4690b30d1dc8662ee4fc91580d78958f39f0b;hb=3a91b81a5d58c2d2c0e15a55efd8c68b42d7571d;hp=3e68e75153c6ef5ca3d916ee84f54c922ebb76c4;hpb=540541b2f150eae2cef07bd2cd2a6031cfd5a4bf;p=packages%2Flibinput.git

diff --git a/libinput.spec b/libinput.spec
index 3e68e75..7de4690 100644
--- a/libinput.spec
+++ b/libinput.spec
@@ -13,24 +13,26 @@
 Summary:	Input device library
 Summary(pl.UTF-8):	Biblioteka urządzeń wejściowych
 Name:		libinput
-Version:	1.15.3
-Release:	1
+Version:	1.17.0
+Release:	2
 License:	MIT
 Group:		Libraries
 Source0:	https://www.freedesktop.org/software/libinput/%{name}-%{version}.tar.xz
-# Source0-md5:	6fbea8d51d9194d7ba33f96d7c4cee56
+# Source0-md5:	9d25bc0618a9abfaee1807358ed468b3
 URL:		https://www.freedesktop.org/wiki/Software/libinput/
 BuildRequires:	check-devel >= 0.9.10
 BuildRequires:	libevdev-devel >= 1.3
 %{?with_libunwind:BuildRequires:	libunwind-devel}
 BuildRequires:	libwacom-devel >= 0.20
-BuildRequires:	meson >= 0.41.0
+BuildRequires:	meson >= 0.45.0
 BuildRequires:	mtdev-devel >= 1.1.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.728
+BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
 BuildRequires:	valgrind
+BuildRequires:	xz
 %if %{with gui}
 BuildRequires:	cairo-devel
 BuildRequires:	glib2-devel >= 2.0
@@ -95,25 +97,11 @@ that use libinput.
 Ten pakiet zawiera pliki nagłówkowe niezbędne do tworzenia aplikacji
 wykorzystujących bibliotekę libinput.
 
-%package static
-Summary:	Static libinput library
-Summary(pl.UTF-8):	Statyczna biblioteka libinput
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static libinput library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka libinput.
-
 %package apidocs
 Summary:	API documentation for libinput library
 Summary(pl.UTF-8):	Dokumentacja API biblioteki libinput
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description apidocs
 API documentation for libinput library.
@@ -138,8 +126,9 @@ Dopełnianie parametrów w zsh dla polecenia libinput.
 %setup -q
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
+	tools/libinput-analyze-{per-slot-delta,recording,touch-down-state}.py \
 	tools/libinput-measure-{fuzz,touchpad-pressure,touch-size,touchpad-tap}.py \
-	tools/libinput-replay
+	tools/libinput-{replay,measure-touchpad-size}.py
 
 %build
 %meson build \
@@ -147,14 +136,15 @@ Dopełnianie parametrów w zsh dla polecenia libinput.
 	-Ddocumentation=%{__true_false doc} \
 	-Dudev-dir=/lib/udev \
 	-Dzshcompletiondir=%{zsh_compdir}
-%meson_build -C build
 
-%{?with_tests:%meson_test -C build}
+%ninja_build -C build
+
+%{?with_tests:%ninja_test -C build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/libinput-test-suite.1
 
@@ -171,12 +161,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libinput.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libinput.so.10
 %dir %{_libexecdir}/libinput
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-analyze
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-analyze-per-slot-delta
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-analyze-recording
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-analyze-touch-down-state
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-debug-events
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-debug-tablet
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-list-devices
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-fuzz
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-touchpad-pressure
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-touchpad-size
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-touchpad-tap
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-touch-size
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-quirks
@@ -190,12 +185,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/libinput
 %{_datadir}/libinput/*.quirks
 %{_mandir}/man1/libinput.1*
+%{_mandir}/man1/libinput-analyze.1*
+%{_mandir}/man1/libinput-analyze-per-slot-delta.1*
+%{_mandir}/man1/libinput-analyze-recording.1*
+%{_mandir}/man1/libinput-analyze-touch-down-state.1*
 %{_mandir}/man1/libinput-debug-events.1*
 %{_mandir}/man1/libinput-debug-tablet.1*
 %{_mandir}/man1/libinput-list-devices.1*
 %{_mandir}/man1/libinput-measure.1*
 %{_mandir}/man1/libinput-measure-fuzz.1*
 %{_mandir}/man1/libinput-measure-touchpad-pressure.1*
+%{_mandir}/man1/libinput-measure-touchpad-size.1*
 %{_mandir}/man1/libinput-measure-touchpad-tap.1*
 %{_mandir}/man1/libinput-measure-touch-size.1*
 %{_mandir}/man1/libinput-quirks.1*
@@ -220,7 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with doc}
 %files apidocs
 %defattr(644,root,root,755)
-%doc build/api/*
+%doc build/doc/html/*
 %endif
 
 %files -n zsh-completion-%{name}