X-Git-Url: http://git.pld-linux.org/?p=packages%2Flibinput.git;a=blobdiff_plain;f=libinput.spec;h=18e2367c39c48383d9b37c641d77ad16a71b6c24;hp=8b10379cdc6ad1a35212abc8a30b4b23b2e8569a;hb=014b855;hpb=bc749beb8559a3367bb9ef3bea7129ed415fe05f

diff --git a/libinput.spec b/libinput.spec
index 8b10379..18e2367 100644
--- a/libinput.spec
+++ b/libinput.spec
@@ -1,8 +1,10 @@
+# TODO:
+# - package user docs from build/Documentation
 #
 # Conditional build:
 %bcond_without	gui		# libinput-debug-gui
+%bcond_with	gtk4		# build libinput-debug-gui with gtk4
 %bcond_without	libunwind	# libunwind debugging support
-%bcond_with	static_libs	# static library
 %bcond_without	doc		# documentation
 %bcond_without	tests		# tests
 
@@ -12,31 +14,48 @@
 Summary:	Input device library
 Summary(pl.UTF-8):	Biblioteka urządzeń wejściowych
 Name:		libinput
-Version:	1.10.1
+Version:	1.19.1
 Release:	1
 License:	MIT
 Group:		Libraries
 Source0:	https://www.freedesktop.org/software/libinput/%{name}-%{version}.tar.xz
-# Source0-md5:	b3d009f36691cb9c340a18109df837ef
+# Source0-md5:	5176f5b2806807df23c5e315bcbf6567
 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.49.0
+BuildRequires:	mtdev-devel >= 1.1.0
+BuildRequires:	ninja >= 1.5
+BuildRequires:	pkgconfig
+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
+%if %{with gtk4}
+BuildRequires:	gtk4-devel >= 4.0
+%else
 BuildRequires:	gtk+3-devel >= 3.20
 %endif
-%if %{with apidocs}
+BuildRequires:	wayland-devel
+BuildRequires:	wayland-protocols
+BuildRequires:	xorg-lib-libX11-devel
+%endif
+%if %{with doc}
 BuildRequires:	doxygen >= 1.8.3
 BuildRequires:	graphviz >= 2.26.0
+BuildRequires:	python3-recommonmark
+BuildRequires:	python3-sphinx_rtd_theme
+BuildRequires:	sphinx-pdg-3
+%endif
+%if %{with gui} && %{without gtk4}
+BuildConflicts:	gtk4-devel
 %endif
-BuildRequires:	libevdev-devel >= 1.3
-%{?with_libunwind:BuildRequires:	libunwind-devel}
-BuildRequires:	libwacom-devel >= 0.20
-BuildRequires:	meson >= 0.40.0
-BuildRequires:	mtdev-devel >= 1.1.0
-BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.728
-BuildRequires:	udev-devel
 Requires:	libevdev >= 1.3
 Requires:	libwacom >= 0.20
 Requires:	mtdev >= 1.1.0
@@ -66,7 +85,11 @@ Summary:	Debugging GUI for libinput
 Summary(pl.UTF-8):	Graficzny interfejs diagnostyczny do libinput
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
+%if %{with gtk4}
+Requires:	gtk4 >= 4.0
+%else
 Requires:	gtk+3 >= 3.20
+%endif
 
 %description gui
 Debugging GUI for libinput.
@@ -89,25 +112,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
 
 %description apidocs
 API documentation for libinput library.
@@ -115,24 +124,44 @@ API documentation for libinput library.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki libinput.
 
+%package -n zsh-completion-%{name}
+Summary:	Zsh completion for libinput command
+Summary(pl.UTF-8):	Dopełnianie parametrów w zsh dla polecenia libinput
+Group:		Applications/Shells
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	zsh
+
+%description -n zsh-completion-%{name}
+Zsh completion for libinput command.
+
+%description -n zsh-completion-%{name} -l pl.UTF-8
+Dopełnianie parametrów w zsh dla polecenia libinput.
+
 %prep
 %setup -q
 
-%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' tools/libinput-measure-{trackpoint-range,touchpad-pressure,touch-size,touchpad-tap}
+%{__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,measure-touchpad-size}.py
 
 %build
 %meson build \
 	-Ddebug-gui=%{__true_false gui} \
 	-Ddocumentation=%{__true_false doc} \
-	-Dudev-dir=/lib/udev
-%meson_build -C build
+	-Dudev-dir=/lib/udev \
+	-Dzshcompletiondir=%{zsh_compdir}
+
+%ninja_build -C build
 
-%{?with_tests:%meson_test -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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,31 +173,51 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING README.md
 %attr(755,root,root) %{_bindir}/libinput
-%attr(755,root,root) %{_bindir}/libinput-debug-events
-%attr(755,root,root) %{_bindir}/libinput-list-devices
 %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-measure-trackpoint-range
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-quirks
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-record
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-replay
 %attr(755,root,root) /lib/udev/libinput-device-group
-%attr(755,root,root) /lib/udev/libinput-model-quirks
+%attr(755,root,root) /lib/udev/libinput-fuzz-extract
+%attr(755,root,root) /lib/udev/libinput-fuzz-to-zero
 /lib/udev/rules.d/80-libinput-device-groups.rules
-/lib/udev/hwdb.d/90-libinput-model-quirks.hwdb
-/lib/udev/rules.d/90-libinput-model-quirks.rules
+/lib/udev/rules.d/90-libinput-fuzz-override.rules
+%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-measure-trackpoint-range.1*
+%{_mandir}/man1/libinput-quirks.1*
+%{_mandir}/man1/libinput-quirks-list.1*
+%{_mandir}/man1/libinput-quirks-validate.1*
+%{_mandir}/man1/libinput-record.1*
+%{_mandir}/man1/libinput-replay.1*
 
 %if %{with gui}
 %files gui
@@ -183,12 +232,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libinput.h
 %{_pkgconfigdir}/libinput.pc
 
-%if %{with static_libs}
-%files static
+%if %{with doc}
+%files apidocs
 %defattr(644,root,root,755)
-%{_libdir}/libinput.a
+%doc build/doc/html/*
 %endif
 
-%files apidocs
+%files -n zsh-completion-%{name}
 %defattr(644,root,root,755)
-%doc build/html/*
+%{zsh_compdir}/_libinput