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.changes 2014-06-16 21:34:33.000000000 +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 <[email protected]> + +- Add a conflict with solaar-cli to solar-udev + +------------------------------------------------------------------- +Thu Aug 1 09:55:42 UTC 2019 - Andreas Schneider <[email protected]> + +- 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 <[email protected]> + +- 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 [email protected] -- 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. -%package cli -Summary: Command line devices manager for the Logitech Unifying Receiver -Group: Hardware/Other -Requires: python-gobject -Requires: python-pyudev - -%description cli -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. - %package doc Summary: Documentation for %{name} Group: Documentation/Other @@ -72,51 +65,52 @@ standard Linux system configuration) are supported. For a full list of supported devices and their features, see docs/devices.md. -%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 -%define _udevprefix /usr/lib -%else -%define _udevprefix /lib -%endif +%package udev +Summary: Udev rules for accessing Logitech Unifying Receiver +Group: Hardware/Other +Requires: udev +Conflicts: solaar-cli < %{version} + +%description udev +Rules that users are able to access Logitech Unifying Receiver. %prep -%setup -q -n Solaar-%{version} -%patch0 -p1 +%autosetup -p1 -n Solaar-%{version} + +# Fix desktop file installation sed -i '/yield autostart_path/d' setup.py %build -python setup.py build +sed -i 's#/usr/bin/env python##' lib/solaar/gtk.py lib/solaar/tasks.py +%python3_build %install -python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} -install -Dm0644 rules.d/42-logitech-unify-permissions.rules %{buildroot}%{_udevprefix}/udev/rules.d/42-logitech-unify-permissions.rules +%python3_install +%fdupes %{buildroot}%{python3_sitelib} +%fdupes -s %{buildroot}%{_datadir} %suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop -%fdupes -s %{buildroot}%{_datadir}/ -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun +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 %files -%defattr(-,root,root) -%doc ChangeLog COPYING COPYRIGHT README.md +%doc ChangeLog COPYRIGHT README.md +%license COPYING %{_bindir}/%{name} +%{_bindir}/%{name}-cli +%{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/solaar.svg -%{_datadir}/%{name}/ -%{python_sitelib}/solaar/ui/ -%{python_sitelib}/solaar/gtk.* +%{python3_sitelib}/hidapi +%{python3_sitelib}/logitech_receiver +%{python3_sitelib}/solaar +%{python3_sitelib}/solaar-* -%files cli -%defattr(-,root,root) -%{_bindir}/%{name}-cli -%{_udevprefix}/udev/rules.d/*.rules -%{python_sitelib}/* -%exclude %{python_sitelib}/solaar/ui/ -%exclude %{python_sitelib}/solaar/gtk.* +%files udev +%{_udevrulesdir}/42-logitech-unify-permissions.rules %files doc %defattr(-,root,root) ++++++ 0001-Fix-reading-and-storing-DPI-in-config-settings.patch ++++++ >From ed65de38e3eb712aca65d2b135c77a23c411b613 Mon Sep 17 00:00:00 2001 From: Andreas Schneider <[email protected]> Date: Thu, 1 Aug 2019 11:41:21 +0200 Subject: [PATCH] Fix reading and storing DPI in config settings --- lib/logitech_receiver/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/logitech_receiver/settings.py b/lib/logitech_receiver/settings.py index df91ccc..ff9f7f9 100644 --- a/lib/logitech_receiver/settings.py +++ b/lib/logitech_receiver/settings.py @@ -356,6 +356,8 @@ class ChoicesValidator(object): else: if isinstance(new_value, int): choice = self.choices[new_value] + elif int(new_value) in self.choices: + choice = self.choices[int(new_value)] elif new_value in self.choices: choice = self.choices[new_value] else: -- 2.22.0 ++++++ solaar-0.9.2.tar.gz -> solaar-1.0.1.tar.gz ++++++ ++++ 13539 lines of diff (skipped)
