From ab35f8e4966f15b4eae521fbb1ef6391f4f47e34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 21 Mar 2018 20:41:09 +0100 Subject: [PATCH] - updated to 1.72.2 --- laptop-mode-tools.spec | 33 ++++++++------------ lmt-config-gui.desktop | 8 ----- wireless-power-no-iw-txpower.patch | 27 ----------------- wireless-power-on-off-fix.patch | 48 ------------------------------ 4 files changed, 13 insertions(+), 103 deletions(-) delete mode 100644 lmt-config-gui.desktop delete mode 100644 wireless-power-no-iw-txpower.patch delete mode 100644 wireless-power-on-off-fix.patch diff --git a/laptop-mode-tools.spec b/laptop-mode-tools.spec index 2b88499..2fd9566 100644 --- a/laptop-mode-tools.spec +++ b/laptop-mode-tools.spec @@ -17,18 +17,15 @@ Summary: Laptop Mode Tools Summary(pl.UTF-8): Narzędzia do trybu laptopowego Name: laptop-mode-tools -Version: 1.71 -Release: 4 +Version: 1.72.2 +Release: 1 License: GPL Group: Applications/System Source0: https://github.com/rickysarraf/laptop-mode-tools/archive/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 8b9a2d9db7dd9d0a99b635a1185f292c +# Source0-md5: 8a7b3658b0137ce893fe6a224fffd7ba Source1: %{name}.init -Source2: lmt-config-gui.desktop Patch0: no-exec-redirection.patch Patch1: cpufreq-pstate.patch -Patch2: wireless-power-on-off-fix.patch -Patch3: wireless-power-no-iw-txpower.patch URL: https://github.com/rickysarraf/laptop-mode-tools BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.714 @@ -116,8 +113,6 @@ GUI dla narzędzi do trybu laptopowego. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %{__sed} -i -e 's|/usr/bin/env python2|/usr/bin/python|' gui/LMT.py @@ -130,16 +125,12 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir}} INIT_D=$RPM_BUILD_ROOT/etc/rc.d/init.d \ ULIB_D=%{_libdir} \ MAN_D=%{_mandir} \ - TMPFILES_D=/usr/lib/tmpfiles.d \ + TMPFILES_D=%{systemdtmpfilesdir} \ %{!?with_acpi:ACPI=disabled} \ %{!?with_apm:APM=disabled} \ DESTDIR=$RPM_BUILD_ROOT install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/laptop-mode -install -p %{SOURCE2} $RPM_BUILD_ROOT/%{_desktopdir} - -install -p gui/LMT.py $RPM_BUILD_ROOT%{_datadir}/%{name}/lmt.py -install -p gui/lmt-config-gui $RPM_BUILD_ROOT%{_bindir}/ %clean rm -rf $RPM_BUILD_ROOT @@ -170,10 +161,10 @@ fi %attr(754,root,root) /etc/rc.d/init.d/laptop-mode %attr(755,root,root) /lib/udev/lmt-udev /lib/udev/rules.d/99-laptop-mode.rules -/usr/lib/tmpfiles.d/laptop-mode.conf -/lib/systemd/system/laptop-mode.service -/lib/systemd/system/laptop-mode.timer -/lib/systemd/system/lmt-poll.service +%{systemdtmpfilesdir}/laptop-mode.conf +%{systemdunitdir}/laptop-mode.service +%{systemdunitdir}/laptop-mode.timer +%{systemdunitdir}/lmt-poll.service %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/modules %attr(755,root,root) %{_datadir}/%{name}/modules/* @@ -211,7 +202,9 @@ fi %files gui %defattr(644,root,root,755) -%{_datadir}/%{name}/lmt.py -%attr(755,root,root) %{_bindir}/lmt-config-gui +%{_datadir}/%{name}/LMT.py +%attr(755,root,root) %{_sbindir}/lmt-config-gui +%attr(755,root,root) %{_sbindir}/lmt-config-gui-pkexec %{_datadir}/polkit-1/actions/org.linux.lmt.gui.policy -%{_desktopdir}/lmt-config-gui.desktop +%{_desktopdir}/laptop-mode-tools.desktop +%{_pixmapsdir}/laptop-mode-tools.svg diff --git a/lmt-config-gui.desktop b/lmt-config-gui.desktop deleted file mode 100644 index 692edc6..0000000 --- a/lmt-config-gui.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Laptop Mode Tools Configuration -GenericName=Laptop Mode Tools Configuration -Exec=/usr/bin/lmt-config-gui -Categories=System; -Comment=Enable/disable Laptop Mode Tools settings -Keywords=Preferences; diff --git a/wireless-power-no-iw-txpower.patch b/wireless-power-no-iw-txpower.patch deleted file mode 100644 index 38afeab..0000000 --- a/wireless-power-no-iw-txpower.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9ca191ff3e5b002f759d69435f14c7f54020085f Mon Sep 17 00:00:00 2001 -From: Ritesh Raj Sarraf -Date: Sun, 12 Mar 2017 17:03:42 +0530 -Subject: [PATCH] For iw, txpower needs a device specific value. Hence, drop it - -Thanks: Andrey Polyakov -Closes: https://github.com/rickysarraf/laptop-mode-tools/pull/95 ---- - usr/share/laptop-mode-tools/modules/wireless-power | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/usr/share/laptop-mode-tools/modules/wireless-power b/usr/share/laptop-mode-tools/modules/wireless-power -index b84beb5..b17324d 100755 ---- a/usr/share/laptop-mode-tools/modules/wireless-power -+++ b/usr/share/laptop-mode-tools/modules/wireless-power -@@ -66,11 +66,6 @@ setPowerSave() { - - if [ -n "$IW" ]; then - $IW dev $IF set power_save $ONOFF -- if [ $ONOFF = "on" ]; then -- $IW dev $IF set txpower auto -- else -- $IW dev $IF set txpower fixed -- fi - else - $IWCONFIG $IF power $ONOFF - if [ $ONOFF = "on" ]; then diff --git a/wireless-power-on-off-fix.patch b/wireless-power-on-off-fix.patch deleted file mode 100644 index 9833be7..0000000 --- a/wireless-power-on-off-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 791191702b91f7e23b280f35e292869631f5ba22 Mon Sep 17 00:00:00 2001 -From: Ritesh Raj Sarraf -Date: Sun, 12 Mar 2017 16:40:54 +0530 -Subject: [PATCH] Fix correct "ON" string - -Thanks: Andrey Polyakov - -Fix again ---- - usr/share/laptop-mode-tools/modules/wireless-power | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/usr/share/laptop-mode-tools/modules/wireless-power b/usr/share/laptop-mode-tools/modules/wireless-power -index 8800a89..b84beb5 100755 ---- a/usr/share/laptop-mode-tools/modules/wireless-power -+++ b/usr/share/laptop-mode-tools/modules/wireless-power -@@ -66,14 +66,14 @@ setPowerSave() { - - if [ -n "$IW" ]; then - $IW dev $IF set power_save $ONOFF -- if [ $ONOFF = "ON" ]; then -+ if [ $ONOFF = "on" ]; then - $IW dev $IF set txpower auto - else - $IW dev $IF set txpower fixed - fi - else - $IWCONFIG $IF power $ONOFF -- if [ $ONOFF = "ON" ]; then -+ if [ $ONOFF = "on" ]; then - $IWCONFIG $IF txpower auto - else - $IWCONFIG $IF txpower fixed -@@ -106,10 +106,10 @@ if [ x$CONTROL_WIRELESS_POWER_SAVING = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x - fi - - # Translate 1 => on, 0 => off -- WIRELESS_AC_POWER_SAVING_ONOFF=off -- WIRELESS_BATT_POWER_SAVING_ONOFF=off -- [ "$WIRELESS_AC_POWER_SAVING" = 1 ] && WIRELESS_AC_POWER_SAVING_ONOFF=on -- [ "$WIRELESS_BATT_POWER_SAVING" = 1 ] && WIRELESS_BATT_POWER_SAVING_ONOFF=on -+ WIRELESS_AC_POWER_SAVING_ONOFF="off" -+ WIRELESS_BATT_POWER_SAVING_ONOFF="off" -+ [ "$WIRELESS_AC_POWER_SAVING" = 1 ] && WIRELESS_AC_POWER_SAVING_ONOFF="on" -+ [ "$WIRELESS_BATT_POWER_SAVING" = 1 ] && WIRELESS_BATT_POWER_SAVING_ONOFF="on" - - WIFI_IFNAMES="" - findWifiIfs -- 2.44.0