commit solaar for openSUSE:Factory

2020-10-23 Thread root
Hello community,

here is the log from the commit of package solaar for openSUSE:Factory checked 
in at 2020-10-23 12:21:55

Comparing /work/SRC/openSUSE:Factory/solaar (Old)
 and  /work/SRC/openSUSE:Factory/.solaar.new.3463 (New)


Package is "solaar"

Fri Oct 23 12:21:55 2020 rev:9 rq:843454 version:1.0.4

Changes:

--- /work/SRC/openSUSE:Factory/solaar/solaar.changes2020-08-05 
20:28:57.531084831 +0200
+++ /work/SRC/openSUSE:Factory/.solaar.new.3463/solaar.changes  2020-10-23 
12:23:31.856732068 +0200
@@ -1,0 +2,36 @@
+Thu Oct 22 14:52:16 UTC 2020 - Andreas Schneider 
+
+- Update to version 1.0.4
+  * Support USB and BT connected devices that are not in descriptors.py
+  * Use FRIENDLY NAME for codename if needed and available.
+  * Extract manufacturer and product ID from Udev HID information.
+  * Add Bluetooth and USB product IDs to device descriptors records.
+  * Support Bluetooth-connected devices.
+  * Add model ID and unit ID to device identification.
+  * Support changing DPI by pressing DPI Switch button and sliding horizontally
+  * Add device-specific notification handlers.
+  * Add MX Vertical USB information.
+  * Udev rule adds seat permissions for all Logitech devices.
+  * Support USB-connected devices in GUI.
+  * Make probe and config work for USB-connected devices.
+  * Improve strings and display for settings.
+  * Correctly handle non-unifying connection notifications.
+  * Update GUI strings for several settings.
+  * Better support for EX100 and devices that connect to it.
+  * Partial support for feature GESTURE_2.
+  * Simplify interface for settings.
+  * Use DJ connection notifications to set device active status
+  * Udev rule sets seat write permissions for hidraw nodes for device as well 
as receivers.
+  * Handle USB devices that use HID++ protocol in CLI.
+  * Use device hidraw nodes where possible.
+  * Handle receivers with serial numbers that don't provide number of pairings.
+  * Ignore exceptions when setting locale.
+  * Correctly discover settings that share a name.
+  * Don't show pop-up notifications at startup.
+  * Keep battery voltage updated in GUI.
+  * Add Portugese translation.
+  * Update several translations.
+  * Add Lightspeed receivers c545 and c541.
+  * Reimplement REPROG_CONTROLS data structure.
+
+---

Old:

  solaar-1.0.3.tar.gz

New:

  solaar-1.0.4.tar.gz



Other differences:
--
++ solaar.spec ++
--- /var/tmp/diff_new_pack.7MW9q6/_old  2020-10-23 12:23:32.768732702 +0200
+++ /var/tmp/diff_new_pack.7MW9q6/_new  2020-10-23 12:23:32.772732705 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   solaar
-Version:1.0.3
+Version:1.0.4
 Release:0
 Summary:Linux devices manager for the Logitech Unifying Receiver
 License:GPL-2.0-or-later

++ solaar-1.0.3.tar.gz -> solaar-1.0.4.tar.gz ++
 11499 lines of diff (skipped)




commit solaar for openSUSE:Factory

2020-08-05 Thread root
Hello community,

here is the log from the commit of package solaar for openSUSE:Factory checked 
in at 2020-08-05 20:28:36

Comparing /work/SRC/openSUSE:Factory/solaar (Old)
 and  /work/SRC/openSUSE:Factory/.solaar.new.3592 (New)


Package is "solaar"

Wed Aug  5 20:28:36 2020 rev:8 rq:824448 version:1.0.3

Changes:

--- /work/SRC/openSUSE:Factory/solaar/solaar.changes2020-05-26 
17:21:15.532224856 +0200
+++ /work/SRC/openSUSE:Factory/.solaar.new.3592/solaar.changes  2020-08-05 
20:28:57.531084831 +0200
@@ -1,0 +2,45 @@
+Mon Aug  3 07:48:14 UTC 2020 - Andreas Schneider 
+
+- Update to version 1.0.3
+  * Remove deprecated solaar-cli application.
+  * Don't install udev or autostart files from python (or pip).
+  * Solaar needs Python 3.6+ and probably needs kernel 5.2+
+  * Handle exceptions on dynamic settings when device is not connected.
+  * Fix inifinite loop on some low-level write errors
+  * Add support for EX100 keyboard/mouse and receiver (046d:c517)
+  * Add two settings for THUMB_WHEEL feature - inversion and reporting via 
HID++
+  * Update German translation
+  * Use REPORT RATE feature when available to determine polling rate.
+  * Improve config command speed when not printing all settings
+  * Improve config command handling and checking of arguments
+  * Add setting for CHANGE_HOST feature
+  * Add argument to settings for values that are not to persist
+  * Add argument to settings to not wait for reply when writing a value to 
device
+  * Add argument to not wait for reply from request to device
+  * Add settings for MULTIPLATFORM and DUALPLATFORM features
+  * Remove Logitech documents from documentation directory
+  * Change config command to not read all settings when only printing or 
showing one
+  * Display hosts info in 'solaar show' if device supports it
+  * Remove non-working smooth-scrool from M510 v1
+  * Add yapf and flake8 code style checks
+  * Fix feature k375s Fn inversion
+  * Update controls (keys and buttons) and tasks (actions)
+  * Improved way to specify feature settings.
+  * Don't abort on device notifications with unexpected device numbers, just 
warn.
+  * Keep track of non-features so as not to ask device multiple times.
+  * Implement KEYBOARD DISABLE KEYS feature.
+  * Don't create notifications for DJ device activity reports.
+  * Update a few special keys and actions.
+  * Add keyed choice settings in configuration panel.
+  * Support remappable keys from reprogrammable keys v4 feature.
+  * Add setting class for keyed choice.
+  * Only check for features once per device.
+  * Use settings interface to show feature values in solaar show if no special 
code for feature.
+  * Remove maximum window size.
+  * Process battery voltage notifications.
+  * Display battery voltage information in main window if regular battery 
information not available.
+  * Show next battery level where available.
+  * Update list of implemented features and provide information on how to 
implement features.
+  * Add c53d as a Lightspeed receiver.
+
+---

Old:

  solaar-1.0.2.tar.gz

New:

  solaar-1.0.3.tar.gz



Other differences:
--
++ solaar.spec ++
--- /var/tmp/diff_new_pack.PQeA2S/_old  2020-08-05 20:28:58.403085286 +0200
+++ /var/tmp/diff_new_pack.PQeA2S/_new  2020-08-05 20:28:58.403085286 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   solaar
-Version:1.0.2
+Version:1.0.3
 Release:0
 Summary:Linux devices manager for the Logitech Unifying Receiver
 License:GPL-2.0-or-later
@@ -94,11 +94,9 @@
 %fdupes -s %{buildroot}%{_datadir}
 %suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-rm -rf %{buildroot}%{_sysconfdir}/udev
 install -d 0755 %{buildroot}%{_udevrulesdir}
 install -m 0644 rules.d/42-logitech-unify-permissions.rules 
%{buildroot}%{_udevrulesdir}/42-logitech-unify-permissions.rules
 
-rm %{buildroot}%{_bindir}/solaar-cli
 ln -s solaar %{buildroot}%{_bindir}/solaar-cli
 
 %posttrans udev

++ solaar-1.0.2.tar.gz -> solaar-1.0.3.tar.gz ++
 27384 lines of diff (skipped)




commit solaar for openSUSE:Factory

2020-05-26 Thread root
Hello community,

here is the log from the commit of package solaar for openSUSE:Factory checked 
in at 2020-05-26 17:21:04

Comparing /work/SRC/openSUSE:Factory/solaar (Old)
 and  /work/SRC/openSUSE:Factory/.solaar.new.2738 (New)


Package is "solaar"

Tue May 26 17:21:04 2020 rev:7 rq:808433 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/solaar/solaar.changes2019-10-03 
14:10:10.339990283 +0200
+++ /work/SRC/openSUSE:Factory/.solaar.new.2738/solaar.changes  2020-05-26 
17:21:15.532224856 +0200
@@ -1,0 +2,8 @@
+Sat May 23 10:33:46 UTC 2020 - Andreas Schneider 
+
+- Update to version 1.0.2
+- Removed 0001-Fix-reading-and-storing-DPI-in-config-settings.patch
+- Removed 0001-data-fix-icon-theme-for-battery-level.patch
+- Removed 0005-notifications-fix-battery-status-notification-parsin.patch
+
+---

Old:

  0001-Fix-reading-and-storing-DPI-in-config-settings.patch
  0001-data-fix-icon-theme-for-battery-level.patch
  0005-notifications-fix-battery-status-notification-parsin.patch
  solaar-1.0.1.tar.gz

New:

  solaar-1.0.2.tar.gz



Other differences:
--
++ solaar.spec ++
--- /var/tmp/diff_new_pack.VVLjlY/_old  2020-05-26 17:21:16.240226378 +0200
+++ /var/tmp/diff_new_pack.VVLjlY/_new  2020-05-26 17:21:16.244226387 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package solaar
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,21 +17,15 @@
 
 
 Name:   solaar
-Version:1.0.1
+Version:1.0.2
 Release:0
 Summary:Linux devices manager for the Logitech Unifying Receiver
 License:GPL-2.0-or-later
 Group:  Hardware/Other
-Url:https://pwr-solaar.github.io/Solaar
+URL:https://pwr-solaar.github.io/Solaar
 Source0:
https://github.com/pwr/Solaar/archive/%{version}/%{name}-%{version}.tar.gz
 #PATCH-FIX-OPENSUSE solaar-fix-desktop-categories.patch 
malcolmle...@opensuse.org -- Fix desktop categories as per openSUSE desktop 
file specification.
 Patch0: solaar-fix-desktop-categories.patch
-# https://github.com/pwr-Solaar/Solaar/pull/546
-Patch1: 0001-Fix-reading-and-storing-DPI-in-config-settings.patch
-# 
https://github.com/pwr-Solaar/Solaar/commit/a06ea6de11259ca1511e7fe759306e7db47fb1da
-Patch2: 0001-data-fix-icon-theme-for-battery-level.patch
-# 
https://github.com/pwr-Solaar/Solaar/commit/69815558041b84da9add36d4bd1503415a3ac0c0
-Patch3: 0005-notifications-fix-battery-status-notification-parsin.patch
 #
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
@@ -39,12 +33,17 @@
 BuildRequires:  python3-setuptools
 BuildRequires:  update-desktop-files
 #
+BuildRequires:  python3-gobject
 Requires:   python3-gobject
+BuildRequires:  python3-gobject-Gdk
 Requires:   python3-gobject-Gdk
+BuildRequires:  python3-pyudev
 Requires:   python3-pyudev
-Requires:   solaar-udev >= %{version}
+BuildRequires:  typelib-1_0-Gtk-3_0
 Requires:   typelib-1_0-Gtk-3_0
 #
+Requires:   solaar-udev >= %{version}
+#
 Obsoletes:  solaar-cli < %{version}
 Provides:   solaar-cli = %{version}
 #
@@ -95,6 +94,7 @@
 %fdupes -s %{buildroot}%{_datadir}
 %suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+rm -rf %{buildroot}%{_sysconfdir}/udev
 install -d 0755 %{buildroot}%{_udevrulesdir}
 install -m 0644 rules.d/42-logitech-unify-permissions.rules 
%{buildroot}%{_udevrulesdir}/42-logitech-unify-permissions.rules
 

++ solaar-1.0.1.tar.gz -> solaar-1.0.2.tar.gz ++
 18381 lines of diff (skipped)

++ solaar-fix-desktop-categories.patch ++
--- /var/tmp/diff_new_pack.VVLjlY/_old  2020-05-26 17:21:16.428226783 +0200
+++ /var/tmp/diff_new_pack.VVLjlY/_new  2020-05-26 17:21:16.428226783 +0200
@@ -1,10 +1,19 @@
-diff -Naur a/share/applications/solaar.desktop 
b/share/applications/solaar.desktop
 a/share/applications/solaar.desktop2013-06-17 09:12:32.0 
-0500
-+++ b/share/applications/solaar.desktop2013-06-27 14:11:58.133763929 
-0500
-@@ -7,5 +7,4 @@
+Index: Solaar-1.0.2/share/applications/solaar.desktop
+===
+--- Solaar-1.0.2.orig/share/applications/solaar.desktop2020-05-23 
12:39:23.881199082 +0200
 Solaar-1.0.2/share/applications/solaar.desktop 2020-05-23 
12:52:28.947896352 +0200
+@@ -4,12 +4,11 @@ Comment=Logitech Unifying Receiver perip
+ Comment[fr]=Gestionnaire de périphériques pour les récepteurs Logitech 
Unifying
+ Com

commit solaar for openSUSE:Factory

2019-10-03 Thread root
Hello community,

here is the log from the commit of package solaar for openSUSE:Factory checked 
in at 2019-10-03 14:10:08

Comparing /work/SRC/openSUSE:Factory/solaar (Old)
 and  /work/SRC/openSUSE:Factory/.solaar.new.2352 (New)


Package is "solaar"

Thu Oct  3 14:10:08 2019 rev:6 rq:734754 version:1.0.1

Changes:

--- /work/SRC/openSUSE:Factory/solaar/solaar.changes2019-09-26 
20:40:48.670610283 +0200
+++ /work/SRC/openSUSE:Factory/.solaar.new.2352/solaar.changes  2019-10-03 
14:10:10.339990283 +0200
@@ -1,0 +2,5 @@
+Thu Oct  3 09:09:21 UTC 2019 - Andreas Schneider 
+
+- Add missing Requries for python3-gobject-Gdk
+
+---



Other differences:
--
++ solaar.spec ++
--- /var/tmp/diff_new_pack.7Vny7q/_old  2019-10-03 14:10:10.891988863 +0200
+++ /var/tmp/diff_new_pack.7Vny7q/_new  2019-10-03 14:10:10.891988863 +0200
@@ -40,6 +40,7 @@
 BuildRequires:  update-desktop-files
 #
 Requires:   python3-gobject
+Requires:   python3-gobject-Gdk
 Requires:   python3-pyudev
 Requires:   solaar-udev >= %{version}
 Requires:   typelib-1_0-Gtk-3_0




commit solaar for openSUSE:Factory

2019-09-26 Thread root
Hello community,

here is the log from the commit of package solaar for openSUSE:Factory checked 
in at 2019-09-26 20:40:44

Comparing /work/SRC/openSUSE:Factory/solaar (Old)
 and  /work/SRC/openSUSE:Factory/.solaar.new.2352 (New)


Package is "solaar"

Thu Sep 26 20:40:44 2019 rev:5 rq:733156 version:1.0.1

Changes:

--- /work/SRC/openSUSE:Factory/solaar/solaar.changes2019-09-18 
13:15:11.852642472 +0200
+++ /work/SRC/openSUSE:Factory/.solaar.new.2352/solaar.changes  2019-09-26 
20:40:48.670610283 +0200
@@ -1,0 +2,5 @@
+Wed Sep 18 13:06:04 UTC 2019 - Andreas Schneider 
+
+- Apply udev rules to existing devices
+
+---



Other differences:
--
++ solaar.spec ++
--- /var/tmp/diff_new_pack.edUlMG/_old  2019-09-26 20:40:49.542607953 +0200
+++ /var/tmp/diff_new_pack.edUlMG/_new  2019-09-26 20:40:49.546607942 +0200
@@ -100,6 +100,11 @@
 rm %{buildroot}%{_bindir}/solaar-cli
 ln -s solaar %{buildroot}%{_bindir}/solaar-cli
 
+%posttrans udev
+# This is needed to apply permissions to existing devices when the package is
+# installed.
+/usr/bin/udevadm trigger --subsystem-match=hidraw --action=add
+
 %files
 %doc ChangeLog COPYRIGHT README.md
 %license COPYING




commit solaar for openSUSE:Factory

2019-09-18 Thread root
Hello community,

here is the log from the commit of package solaar for openSUSE:Factory checked 
in at 2019-09-18 13:14:06

Comparing /work/SRC/openSUSE:Factory/solaar (Old)
 and  /work/SRC/openSUSE:Factory/.solaar.new.7948 (New)


Package is "solaar"

Wed Sep 18 13:14:06 2019 rev:4 rq:731587 version:1.0.1

Changes:

--- /work/SRC/openSUSE:Factory/solaar/solaar.changes2019-08-23 
11:08:52.438464836 +0200
+++ /work/SRC/openSUSE:Factory/.solaar.new.7948/solaar.changes  2019-09-18 
13:15:11.852642472 +0200
@@ -1,0 +2,8 @@
+Tue Sep 17 19:32:16 UTC 2019 - Andreas Schneider 
+
+- Fix icon theme for battery level
+  + Added 0001-data-fix-icon-theme-for-battery-level.patch
+- Fix battery status notifaction parsing
+  + Added 0005-notifications-fix-battery-status-notification-parsin.patch
+
+---

New:

  0001-data-fix-icon-theme-for-battery-level.patch
  0005-notifications-fix-battery-status-notification-parsin.patch



Other differences:
--
++ solaar.spec ++
--- /var/tmp/diff_new_pack.VxJAU9/_old  2019-09-18 13:15:12.332642371 +0200
+++ /var/tmp/diff_new_pack.VxJAU9/_new  2019-09-18 13:15:12.332642371 +0200
@@ -28,6 +28,10 @@
 Patch0: solaar-fix-desktop-categories.patch
 # https://github.com/pwr-Solaar/Solaar/pull/546
 Patch1: 0001-Fix-reading-and-storing-DPI-in-config-settings.patch
+# 
https://github.com/pwr-Solaar/Solaar/commit/a06ea6de11259ca1511e7fe759306e7db47fb1da
+Patch2: 0001-data-fix-icon-theme-for-battery-level.patch
+# 
https://github.com/pwr-Solaar/Solaar/commit/69815558041b84da9add36d4bd1503415a3ac0c0
+Patch3: 0005-notifications-fix-battery-status-notification-parsin.patch
 #
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme

++ 0001-data-fix-icon-theme-for-battery-level.patch ++
>From a06ea6de11259ca1511e7fe759306e7db47fb1da Mon Sep 17 00:00:00 2001
From: Zachary Cook 
Date: Tue, 20 Aug 2019 03:35:31 -0400
Subject: [PATCH 1/5] data: fix icon theme for battery level

It was previously assigning levels 1-89 to caution and 90+ to full, which was 
unintended due to the floor division by 100
---
 lib/solaar/ui/icons.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/solaar/ui/icons.py b/lib/solaar/ui/icons.py
index 3c1616f..3426b0c 100644
--- a/lib/solaar/ui/icons.py
+++ b/lib/solaar/ui/icons.py
@@ -133,9 +133,9 @@ def _battery_icon_name(level, charging):
level_approx = 20 * ((level  + 10) // 20)
 
if _has_mint_icons:
-   if level == 0:
-   return 'battery-empty%s-symbolic' % ('-charging' if 
charging else '')
-   level_name = ('caution', 'low', 'good', 'full')[3*(level_approx 
// 100)]
+   if level == 100 and charging:
+   return 'battery-full-charged-symbolic'
+   level_name = ('empty', 'caution', 'low', 'good', 'good', 
'full')[level_approx // 20]
return 'battery-%s%s-symbolic' % (level_name, '-charging' if 
charging else '')
 
if _has_gpm_icons:
-- 
2.23.0

++ 0005-notifications-fix-battery-status-notification-parsin.patch ++
>From 69815558041b84da9add36d4bd1503415a3ac0c0 Mon Sep 17 00:00:00 2001
From: Alex Cherkayev 
Date: Tue, 20 Aug 2019 10:40:39 +0300
Subject: [PATCH 5/5] notifications: fix battery status notification parsing

Fix indicator tooltip (duplicate Solaar line, python list instead of battery 
status).
---
 lib/logitech_receiver/notifications.py | 7 ---
 lib/solaar/ui/tray.py  | 5 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/logitech_receiver/notifications.py 
b/lib/logitech_receiver/notifications.py
index cd9928f..22d8cb7 100644
--- a/lib/logitech_receiver/notifications.py
+++ b/lib/logitech_receiver/notifications.py
@@ -204,9 +204,10 @@ def _process_hidpp10_notification(device, status, n):
 def _process_feature_notification(device, status, n, feature):
if feature == _F.BATTERY_STATUS:
if n.address == 0x00:
-   discharge = ord(n.data[:1])
-   battery_status = ord(n.data[1:2])
-   status.set_battery_info(discharge, 
_hidpp20.BATTERY_STATUS[battery_status])
+   discharge_level = ord(n.data[:1])
+   discharge_next_level = ord(n.data[1:2])
+   battery_status = ord(n.data[2:3])
+   status.set_battery_info(discharge_level, 
_hidpp20.BATTERY_STATUS[battery_status])
else:
_log.warn("%s: unknown BATTERY %s", device, n)
return True
diff --git a/lib/solaar/ui/tray.py b/lib/solaar/ui/tray.py
index 29bcd

commit solaar for openSUSE:Factory

2019-08-23 Thread root
Hello community,

here is the log from the commit of package solaar for openSUSE:Factory checked 
in at 2019-08-23 11:08:42

Comparing /work/SRC/openSUSE:Factory/solaar (Old)
 and  /work/SRC/openSUSE:Factory/.solaar.new.7948 (New)


Package is "solaar"

Fri Aug 23 11:08:42 2019 rev:3 rq:725367 version:1.0.1

Changes:

--- /work/SRC/openSUSE:Factory/solaar/solaar.changes2014-06-16 
21:34:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.solaar.new.7948/solaar.changes  2019-08-23 
11:08:52.438464836 +0200
@@ -1,0 +2,25 @@
+Thu Aug 22 15:39:02 UTC 2019 - Andreas Schneider 
+
+- Add a conflict with solaar-cli to solar-udev
+
+---
+Thu Aug  1 09:55:42 UTC 2019 - Andreas Schneider 
+
+- Fix reading and storing DPI settings
+  + Added 0001-Fix-reading-and-storing-DPI-in-config-settings.patch
+
+---
+Sat Jul 27 19:01:11 UTC 2019 - Andreas Schneider 
+
+- Update to version 1.0.1:
+  * Updated the repo url.
+  * Fixed typo which was crashing the application.
+  * Improved the HID write routine which was causing issues on some devices.
+  * Fix non-unifying receivers in Linux 5.2.
+  * Add new Lightspeed receiver (used in the G305)
+
+- Updates from version 1.0.0:
+  * First major release after 6 years
+  * Support for a lot of new mice and keyboards
+
+---

Old:

  solaar-0.9.2.tar.gz

New:

  0001-Fix-reading-and-storing-DPI-in-config-settings.patch
  solaar-1.0.1.tar.gz



Other differences:
--
++ solaar.spec ++
--- /var/tmp/diff_new_pack.kO7bVa/_old  2019-08-23 11:08:54.426464590 +0200
+++ /var/tmp/diff_new_pack.kO7bVa/_new  2019-08-23 11:08:54.430464590 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package solaar
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,30 +12,37 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   solaar
-Version:0.9.2
+Version:1.0.1
 Release:0
 Summary:Linux devices manager for the Logitech Unifying Receiver
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Hardware/Other
-Url:http://pwr.github.io/Solaar/
-Source0:
https://github.com/pwr/Solaar/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Url:https://pwr-solaar.github.io/Solaar
+Source0:
https://github.com/pwr/Solaar/archive/%{version}/%{name}-%{version}.tar.gz
 #PATCH-FIX-OPENSUSE solaar-fix-desktop-categories.patch 
malcolmle...@opensuse.org -- Fix desktop categories as per openSUSE desktop 
file specification.
 Patch0: solaar-fix-desktop-categories.patch
+# https://github.com/pwr-Solaar/Solaar/pull/546
+Patch1: 0001-Fix-reading-and-storing-DPI-in-config-settings.patch
+#
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  python-devel
-BuildRequires:  python-distutils-extra
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-setuptools
 BuildRequires:  update-desktop-files
-BuildRequires:  udev
+#
+Requires:   python3-gobject
+Requires:   python3-pyudev
+Requires:   solaar-udev >= %{version}
 Requires:   typelib-1_0-Gtk-3_0
-Requires:   %{name}-cli = %{version}
-Recommends: %{name}-doc = %{version}
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+#
+Obsoletes:  solaar-cli < %{version}
+Provides:   solaar-cli = %{version}
+#
 BuildArch:  noarch
 
 %description
@@ -46,20 +53,6 @@
 standard Linux system configuration) are supported. For a full list of
 supported devices and their features, see docs/devices.md.
 
-%packagecli
-Summary:Command line devices manager for the Logitech Unifying Receiver
-Group:  Hardware/Other
-Requires:   python-gobject
-Requires:   python-pyudev
-
-%descriptioncli
-Solaar will detect all devices paired with your Unifying Receiver, and
-at the very least display some basic information about them.
-
-For some devices, extra settings (usually not available through the
-standard Linux system configuration) are supported. For a full list of
-supported devices and their features, see docs/devices.md.
-
 %packagedoc
 Summary:Documentation for %{name}
 Group: