diff --git a/solaar-evdev.patch b/solaar-evdev.patch new file mode 100644 index 0000000..a3abdaa --- /dev/null +++ b/solaar-evdev.patch @@ -0,0 +1,12 @@ +diff -up Solaar-1.1.2/setup.py.orig Solaar-1.1.2/setup.py +--- Solaar-1.1.2/setup.py.orig 2022-03-26 16:52:06.000000000 +0100 ++++ Solaar-1.1.2/setup.py 2022-03-28 13:18:21.961819251 +0200 +@@ -61,7 +62,7 @@ For instructions on installing Solaar se + # os_requires=['gi.repository.GObject (>= 2.0)', 'gi.repository.Gtk (>= 3.0)'], + python_requires='>=3.6', + install_requires=[ +- 'evdev (>= 1.3.0)', ++ 'evdev (>= 1.1.2)', + 'pyudev (>= 0.13)', + 'PyYAML (>= 3.12)', + 'python-xlib (>= 0.27)', diff --git a/solaar.spec b/solaar.spec index 89f83e7..b323a3e 100644 --- a/solaar.spec +++ b/solaar.spec @@ -2,7 +2,7 @@ #%%global commit e763aeadb4b89b3436c167bcd8c59fa22c92b47a #%%global date 20200802 #%%global distprefix .rc3 -%global tag 1.1.1 +%global tag 1.1.2 Name: solaar Version: %{tag} @@ -16,12 +16,17 @@ Patch0: solaar-paths.patch # Fedora-specific patch; remove udev-acl tag from upsteam udev rules as it only # applies to some old version of ubuntu. Patch1: patch-udev-rules +# https://github.com/pwr-Solaar/Solaar/pull/1516 +Patch2: solaar-evdev.patch BuildArch: noarch License: GPLv2 -BuildRequires: desktop-file-utils python3-devel python3-setuptools systemd +BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: systemd-rpm-macros Requires: hicolor-icon-theme Requires: solaar-udev @@ -104,6 +109,7 @@ fi %_bindir/solaar %_bindir/hidconsole %python3_sitelib/hidapi/ +%python3_sitelib/keysyms %python3_sitelib/logitech_receiver/ %python3_sitelib/solaar/ %python3_sitelib/solaar-%{version}*-py%{python3_version}.egg-info @@ -124,6 +130,12 @@ fi %changelog +* Sun Mar 27 2022 Dominik Mierzejewski - 1.1.2-1 +- update to 1.1.2 (#2068769) +- patch to lower evdev version requirement +- add explicit build dependency on setuptools +- sort build dependencies + * Wed Jan 12 2022 Dominik Mierzejewski - 1.1.1-1 - update to 1.1.1 (#2035614) diff --git a/sources b/sources index d7947b3..a2ffa67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Solaar-1.1.1.tar.gz) = c4da0c5521724c00afbc54ee9d10a4709246bb6f57635637b77e5944293b285a055b7df623e7e2a810a0764021813929e0f4fa7f21d4afc39abd516416a2bf25 +SHA512 (Solaar-1.1.2.tar.gz) = 91981af84f50fdf3e5b34642b6a97038af08aa1fd6dc9988172b165aeb52fd9497e12475508e41682f3090ddc8469e2ef38661f5e6a6b28cbd00cbd7a52d5a9c