commit a31777be9401bac5725f1d9d024a0d9e059a0028 Author: Krzysztof Mrozowicz <mrozo...@pld-linux.org> Date: Fri Jun 25 06:31:27 2021 +0000
- up to 1.0.6 solaar.spec | 110 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 50 deletions(-) --- diff --git a/solaar.spec b/solaar.spec index a649af6..bd5ac41 100644 --- a/solaar.spec +++ b/solaar.spec @@ -1,18 +1,29 @@ Summary: Linux devices manager for the Logitech Unifying Receiver Name: solaar -Version: 0.9.2 +Version: 1.0.6 Release: 1 License: GPL v2 Group: Applications/System Source0: https://github.com/pwr/Solaar/archive/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 2a6ea17150cf030b09ff802cb454358b +# Source0-md5: 0b8ba34ae8968a6f4f17d9311f5e54b6 URL: http://pwr.github.io/Solaar/ -BuildRequires: python-distribute +BuildRequires: python3-dbus +BuildRequires: python3-distribute +BuildRequires: python3-modules +BuildRequires: python3-pygobject3 +BuildRequires: python3-pyudev +BuildRequires: python3-setuptools BuildRequires: rpm-pythonprov -BuildRequires: rpmbuild(macros) >= 1.219 -Requires: python-modules -Requires: python-dbus -Requires: python-pyudev +BuildRequires: rpmbuild(macros) >= 2.000 +Requires: python3-dbus +Requires: python3-modules +Requires: python3-pygobject3 +Requires: python3-pyudev +Requires(post,postun): gtk-update-icon-cache +Requires(post,postun): hicolor-icon-theme +Provides: %{name}-gui = %{version} +Obsoletes: solaar-gui < %{version} +BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -24,72 +35,71 @@ It comes in two flavors, command-line and GUI. Both are able to list the devices paired to a Unifying Receiver, show detailed info for each device, and also pair/unpair supported devices with the receiver. -%package gui -Summary: GUI for Solaar -Group: X11/Applications -Requires: python-pygobject -Requires: %{name} = %{version}-%{release} -Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): hicolor-icon-theme - -%description gui -Solaar is a Linux device manager for Logitech’s Unifying Receiver -peripherals. It is able to pair/unpair devices to the receiver, and -for most devices read battery status. - -It comes in two flavors, command-line and GUI. Both are able to list -the devices paired to a Unifying Receiver, show detailed info for each -device, and also pair/unpair supported devices with the receiver. - %prep %setup -q -n Solaar-%{version} %build -%{__python} setup.py build +%{__python3} setup.py build +cd tools +sh po-compile.sh %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT -%{__python} setup.py \ +%{__python3} setup.py \ install --skip-build \ --optimize=2 \ --root=$RPM_BUILD_ROOT - -%py_postclean +%{__mv} $RPM_BUILD_ROOT%{_prefix}/local/* $RPM_BUILD_ROOT%{_prefix}/ +%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/local +cd $RPM_BUILD_ROOT%{_bindir} +ln -s %{name} %{name}-cli +install -d 0755 $RPM_BUILD_ROOT/lib/udev/rules.d +%{__cp} $RPM_BUILD_ROOT%{_datadir}/solaar/udev-rules.d/42-logitech-unify-permissions.rules $RPM_BUILD_ROOT/lib/udev/rules.d/ %clean rm -rf $RPM_BUILD_ROOT -%post gui +%post %update_icon_cache hicolor -%postun gui -%update_icon_cache hicolor +%posttrans +# This is needed to apply permissions to existing devices when the package is installed. +/bin/udevadm trigger --subsystem-match=hidraw --action=add +%postun +%update_icon_cache hicolor %files %defattr(644,root,root,755) -%doc ChangeLog README.md docs/* -%attr(755,root,root) %{_bindir}/solaar-cli -%dir %{py_sitescriptdir}/hidapi -%{py_sitescriptdir}/hidapi/*.py[co] -%dir %{py_sitescriptdir}/logitech_receiver -%{py_sitescriptdir}/logitech_receiver/*.py[co] -%dir %{py_sitescriptdir}/solaar -%{py_sitescriptdir}/solaar/*.py[co] -%exclude %{py_sitescriptdir}/solaar/gtk.py[co] -%if "%{py_ver}" > "2.4" -%{py_sitescriptdir}/solaar-0.9.2-py2.7.egg-info -%endif - -%files gui -%defattr(644,root,root,755) -/etc/xdg/autostart/solaar.desktop +%doc ChangeLog docs/* %attr(755,root,root) %{_bindir}/solaar +%attr(755,root,root) %{_bindir}/solaar-cli +%dir %{py3_sitedir}/hidapi +%{py3_sitedir}/hidapi/*.py +%dir %{py3_sitedir}/hidapi/__pycache__ +%{py3_sitedir}/hidapi/__pycache__/*.pyc +%dir %{py3_sitedir}/logitech_receiver +%{py3_sitedir}/logitech_receiver/*.py +%dir %{py3_sitedir}/logitech_receiver/__pycache__ +%{py3_sitedir}/logitech_receiver/__pycache__/*.pyc +%dir %{py3_sitedir}/solaar +%{py3_sitedir}/solaar/*.py +%dir %{py3_sitedir}/solaar/__pycache__ +%{py3_sitedir}/solaar/__pycache__/*.pyc +%dir %{py3_sitedir}/solaar/cli +%{py3_sitedir}/solaar/cli/*.py +%dir %{py3_sitedir}/solaar/cli/__pycache__ +%{py3_sitedir}/solaar/cli/__pycache__/*.pyc +%dir %{py3_sitedir}/solaar/ui +%{py3_sitedir}/solaar/ui/*.py +%dir %{py3_sitedir}/solaar/ui/__pycache__ +%{py3_sitedir}/solaar/ui/__pycache__/*.pyc +%{py3_sitedir}/solaar-%{version}-py%{py3_ver}.egg-info %{_datadir}/%{name} %{_desktopdir}/solaar.desktop %{_iconsdir}/hicolor/scalable/apps/solaar.svg -%{py_sitescriptdir}/solaar/gtk.py[co] -%dir %{py_sitescriptdir}/solaar/ui -%{py_sitescriptdir}/solaar/ui/*.py[co] +%{_datadir}/metainfo/io.github.pwr_solaar.solaar.metainfo.xml +%{_localedir}/*/LC_MESSAGES/%{name}.mo +/lib/udev/rules.d/42-logitech-unify-permissions.rules ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/solaar.git/commitdiff/a31777be9401bac5725f1d9d024a0d9e059a0028 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit