diff --git a/.gitignore b/.gitignore index edf6ae0..9a06e56 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libinput-*.tar.bz2 +/libinput-*.tar.xz diff --git a/0001-tools-point-users-to-the-libinput-utils-package-for-.patch b/0001-tools-point-users-to-the-libinput-utils-package-for-.patch new file mode 100644 index 0000000..d0fdf5f --- /dev/null +++ b/0001-tools-point-users-to-the-libinput-utils-package-for-.patch @@ -0,0 +1,28 @@ +From 579e58d5413c96e2e8499354273d5a6604a17627 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 19 Nov 2019 09:38:18 +1000 +Subject: [PATCH] tools: point users to the libinput-utils package for missing + commands + +Signed-off-by: Peter Hutterer +--- + tools/shared.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/shared.c b/tools/shared.c +index 02c09dd..1367a16 100644 +--- a/tools/shared.c ++++ b/tools/shared.c +@@ -542,7 +542,8 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv) + if (errno == ENOENT) { + fprintf(stderr, + "libinput: %s is not a libinput command or not installed. " +- "See 'libinput --help'\n", ++ "See 'libinput --help'\n" ++ "\nThis command may be provided by the libinput-utils package.\n", + command); + return EXIT_INVALID_USAGE; + } else { +-- +2.23.0 + diff --git a/libinput.spec b/libinput.spec index 856e23e..b82cded 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,11 +4,10 @@ %global gitversion 58abea394 Name: libinput -Version: 1.30.1 +Version: 1.15.5 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library -# SPDX License: MIT URL: http://www.freedesktop.org/wiki/Software/libinput/ %if 0%{?gitdate} @@ -16,20 +15,20 @@ Source0: %{name}-%{gitdate}.tar.xz Source1: make-git-snapshot.sh Source2: commitid %else -Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 +Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif +Patch01: 0001-tools-point-users-to-the-libinput-utils-package-for-.patch + BuildRequires: git-core -BuildRequires: gcc +BuildRequires: gcc gcc-c++ BuildRequires: meson BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libwacom) >= 0.20 -BuildRequires: pkgconfig(udev) -BuildRequires: python3-rpm-macros - -BuildRequires: lua-devel +BuildRequires: python3-devel +BuildRequires: check-devel %description libinput is a library that handles input devices for display servers and other @@ -66,16 +65,15 @@ The %{name}-test package contains the libinput test suite. It is not intended to be run by users. %prep -%autosetup -S git -p1 +%autosetup -S git # Replace whatever the source uses with the approved call -%py3_shebang_fix $(git grep -l '#!/usr/bin/.*python3') +pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %build %meson -Ddebug-gui=false \ -Ddocumentation=false \ -Dtests=true \ -Dinstall-tests=true \ - -Dautoload-plugins=true \ -Dudev-dir=%{udevdir} %meson_build @@ -101,7 +99,6 @@ intended to be run by users. %{_libexecdir}/libinput/libinput-debug-events %{_libexecdir}/libinput/libinput-list-devices %{_mandir}/man1/libinput.1* -%dir %{_datadir}/libinput %{_datadir}/libinput/*.quirks %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions @@ -115,37 +112,21 @@ intended to be run by users. %{_libdir}/pkgconfig/libinput.pc %files utils -%{_libexecdir}/libinput/libinput-analyze -%{_libexecdir}/libinput/libinput-analyze-buttons -%{_libexecdir}/libinput/libinput-analyze-per-slot-delta -%{_libexecdir}/libinput/libinput-analyze-recording -%{_libexecdir}/libinput/libinput-analyze-touch-down-state %{_libexecdir}/libinput/libinput-debug-tablet -%{_libexecdir}/libinput/libinput-debug-tablet-pad -%{_libexecdir}/libinput/libinput-list-kernel-devices %{_libexecdir}/libinput/libinput-measure %{_libexecdir}/libinput/libinput-measure-fuzz %{_libexecdir}/libinput/libinput-measure-touchpad-tap %{_libexecdir}/libinput/libinput-measure-touchpad-pressure -%{_libexecdir}/libinput/libinput-measure-touchpad-size %{_libexecdir}/libinput/libinput-measure-touch-size %{_libexecdir}/libinput/libinput-quirks %{_libexecdir}/libinput/libinput-record %{_libexecdir}/libinput/libinput-replay -%{_mandir}/man1/libinput-analyze.1* -%{_mandir}/man1/libinput-analyze-buttons.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-tablet.1* -%{_mandir}/man1/libinput-debug-tablet-pad.1* -%{_mandir}/man1/libinput-list-kernel-devices.1* %{_mandir}/man1/libinput-measure.1* %{_mandir}/man1/libinput-measure-fuzz.1* %{_mandir}/man1/libinput-measure-touchpad-tap.1* %{_mandir}/man1/libinput-measure-touch-size.1* %{_mandir}/man1/libinput-measure-touchpad-pressure.1* -%{_mandir}/man1/libinput-measure-touchpad-size.1* %{_mandir}/man1/libinput-quirks.1* %{_mandir}/man1/libinput-quirks-list.1* %{_mandir}/man1/libinput-quirks-validate.1* @@ -153,235 +134,10 @@ intended to be run by users. %{_mandir}/man1/libinput-replay.1* %files test -%{_libexecdir}/libinput/libinput-test %{_libexecdir}/libinput/libinput-test-suite -%{_libexecdir}/libinput/libinput-test-utils -%{_mandir}/man1/libinput-test.1* %{_mandir}/man1/libinput-test-suite.1* - %changelog -* Mon Dec 08 2025 Peter Hutterer - 1.30.1-1 -- libinput 1.30.1 - -* Tue Nov 25 2025 Peter Hutterer - 1.30.0-1 -- libinput 1.30.0 - -* Mon Nov 24 2025 Peter Hutterer - 1.29.902-2 -- Re-enable plugins on RHEL - lua 5.4 is available - -* Tue Nov 18 2025 Peter Hutterer - 1.29.902-1 -- libinput 1.29.902 - reenable ppc64le - -* Fri Nov 07 2025 Yaakov Selkowitz - 1.29.901-3 -- Disable plugins on RHEL - -* Tue Nov 04 2025 Peter Hutterer - 1.29.901-2 -- Disable plugins on ppc64le - there's no luajit - -* Tue Nov 04 2025 Peter Hutterer - 1.29.901-1 -- libinput 1.29.901 - with plugin autoload enabled - -* Tue Oct 21 2025 Peter Hutterer - 1.29.2-1 -- libinput 1.29.2 - -* Thu Aug 28 2025 Peter Hutterer - 1.29.1-1 -- libinput 1.29.1 - -* Thu Jul 31 2025 Peter Hutterer - 1.29.0-1 -- libinput 1.29.0 - -* Thu Jul 24 2025 Fedora Release Engineering - 1.28.903-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jul 21 2025 Peter Hutterer - 1.28.903-1 -- libinput 1.28.903 (#2382208) - -* Thu Jul 17 2025 Peter Hutterer - 1.28.902-1 -- libinput 1.28.902 - -* Wed Jul 16 2025 Peter Hutterer - 1.28.901-3 -- Fix Alt+PrintScreen not working (#2379912) - -* Tue Jul 15 2025 Peter Hutterer - 1.28.901-2 -- Fix broken mouse wheel on non-high-resolution devices (#2379768) - -* Thu Jul 10 2025 Peter Hutterer - 1.28.901-1 -- libinput 1.28.901 - -* Tue Apr 01 2025 Peter Hutterer - 1.28.1-1 -- libinput 1.28.1 - -* Mon Mar 24 2025 Peter Hutterer - 1.28.0-1 -- libinput 1.28.0 - -* Fri Jan 17 2025 Fedora Release Engineering - 1.27.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jan 06 2025 Peter Hutterer - 1.27.1-1 -- libinput 1.27.1 - -* Fri Nov 22 2024 Peter Hutterer - 1.27.0-2 -- libinput 1.27.0, with sources - -* Tue Nov 19 2024 Peter Hutterer - 1.27.0-1 -- libinput 1.27.0 -- drop the check-devel dependency, no longer needed - -* Mon Aug 19 2024 Peter Hutterer - 1.26.2-1 -- libinput 1.26.2 - -* Thu Jul 18 2024 Fedora Release Engineering - 1.26.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jun 27 2024 Peter Hutterer - 1.26.1-1 -- libinput 1.26.1 - -* Thu Jun 06 2024 Peter Hutterer 1.26.0-1 -- libinput 1.26.0 - -* Fri May 31 2024 Peter Hutterer - 1.25.0-5 -- Mark datadir/libinput as owned by us (#2283754) - -* Wed Mar 27 2024 Arthur Bols - 1.25.0-4 -- Add quirk for Framework 16 to recognize keyboard as internal - -* Thu Jan 25 2024 Fedora Release Engineering - 1.25.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.25.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 15 2024 Peter Hutterer - 1.25.0-1 -- libinput 1.25 - -* Tue Sep 05 2023 Peter Hutterer -- SPDX migration: license is already SPDX compatible - -* Fri Aug 25 2023 Peter Hutterer - 1.24.0-1 -- libinput 1.24.0 - -* Thu Jul 20 2023 Peter Hutterer - 1.23.0-3 -- BuildRequires python3-rpm-macros for pathfix.py - -* Tue Apr 11 2023 Peter Hutterer - 1.23.0-2 -- Add two patches for better Apple touchpad behavior (see libinput MR - 834 and 897) - -* Mon Mar 27 2023 Peter Hutterer - 1.23.0-1 -- libinput 1.23.0 - -* Thu Jan 19 2023 Fedora Release Engineering - 1.22.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 16 2023 Peter Hutterer - 1.22.1-1 -- libinput 1.22.1 - -* Sat Nov 26 2022 Davide Cavalca 1.22.0-2 -- Backport upstream patch to add Apple MTP touchpad quirk for Apple M2 laptops - -* Mon Nov 21 2022 Peter Hutterer - 1.22.0-1git58abea394} -- libinput 1.22.0 - -* Wed Aug 31 2022 Peter Hutterer - 1.21.0-3 -- Add udev to BuildRequires for udevdir to resolve againt - -* Thu Jul 21 2022 Fedora Release Engineering - 1.21.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Peter Hutterer - 1.21.0-1 -- libinput 1.21.0 - -* Wed Apr 20 2022 Peter Hutterer - 1.20.1-1 -- libinput 1.20.1 - -* Mon Feb 21 2022 Peter Hutterer - 1.20.0-1 -- libinput 1.20 - -* Mon Feb 07 2022 Peter Hutterer - 1.19.901-1 -- libinput 1.20rc1 - -* Thu Jan 20 2022 Fedora Release Engineering - 1.19.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Dec 13 2021 Peter Hutterer - 1.19.3-2 -- Rebuild for libwacom soname bump - -* Mon Dec 13 2021 Peter Hutterer - 1.19.3-1 -- libinput 1.19.3 - -* Thu Oct 21 2021 Peter Hutterer - 1.19.2-1 -- libinput 1.19.2 - -* Wed Sep 29 2021 Peter Hutterer - 1.19.1-1 -- libinput 1.19.1 - -* Wed Sep 15 2021 Peter Hutterer - 1.19.0-1 -- libinput 1.19.0 - -* Wed Sep 01 2021 Peter Hutterer - 1.18.901-1 -- libinput 1.18.901 - -* Tue Aug 03 2021 Peter Hutterer - 1.18.1-1 -- libinput 1.18.1 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.18.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jun 21 2021 Peter Hutterer 1.18.0-2 -- Add quirk for the Huawai Matebook 2020 (#1972370) - -* Wed Jun 02 2021 Peter Hutterer 1.18.0-1 -- libinput 1.18.0 - -* Wed May 26 2021 Peter Hutterer 1.17.901-1 -- libinput 1.17.901 - -* Wed May 26 2021 Peter Hutterer 1.17.3-1 -- libinput 1.17.3 - -* Fri Apr 30 2021 Peter Hutterer 1.17.2-1 -- libinput 1.17.2 - -* Wed Mar 24 2021 Peter Hutterer 1.17.1-1 -- libinput 1.17.1 - -* Tue Feb 23 2021 Peter Hutterer 1.17.0-1 -- libinput 1.17.0 - -* Tue Feb 16 2021 Peter Hutterer 1.16.902-1 -- libinput 1.16.902 - -* Tue Jan 26 2021 Fedora Release Engineering - 1.16.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Nov 27 2020 Peter Hutterer 1.16.4-1 -- libinput 1.16.4 - -* Tue Nov 03 2020 Peter Hutterer 1.16.3-1 -- libinput 1.16.3 - -* Tue Sep 22 2020 Peter Hutterer -- Drop gcc-c++ from the BuildRequires, it's no longer needed - -* Thu Aug 13 2020 Peter Hutterer 1.16.1-1 -- libinput 1.16.1 - -* Mon Aug 03 2020 Peter Hutterer 1.16.0-1 -- libinput 1.16.0 - -* Tue Jul 28 2020 Fedora Release Engineering - 1.15.902-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Peter Hutterer 1.15.902-1 -- libinput 1.16rc2 - -* Wed Jul 15 2020 Peter Hutterer 1.15.901-1 -- libinput 1.16rc1 - -* Fri Jun 19 2020 Peter Hutterer 1.15.6-1 -- libinput 1.15.6 - * Sat Apr 11 2020 Peter Hutterer 1.15.5-1 - libinput 1.15.5 @@ -976,7 +732,7 @@ intended to be run by users. * Fri May 29 2015 Peter Hutterer 0.15.0-4 - Add tap-to-end-drag patch (#1225998) - + * Wed May 27 2015 Peter Hutterer 0.15.0-3 - Refine disable-while-typing (#1209753) diff --git a/sources b/sources index b53b11e..50edfa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.30.1.tar.bz2) = 6d9bb5653dfeb0e30c64e92f8146a8908233162ef39f89114f619605b7f0de3f9e0f344412d91c809d3c1dc3d4b836a5709373a80191484db3c6d0a8f69c4f82 +SHA512 (libinput-1.15.5.tar.xz) = a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a