From fc9f9bc129c0cad96bf01e12dca4a78415d74c6b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 22 Aug 2019 17:40:21 +0200 Subject: [PATCH] Move the NetworkManager dispatcher script out of /etc It's not user configuration and shouldn't ever have been there. Except for that it used to be the only location NetworkManager looked into. With NetworkManager 1.20 that is no longer the case and the dispatcher scripts can be moved to /usr/lib. --- ...Manager-dispatcher-script-out-of-etc.patch | 29 +++++++++++++++++++ tlp.spec | 10 +++++-- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 0001-Move-the-NetworkManager-dispatcher-script-out-of-etc.patch diff --git a/0001-Move-the-NetworkManager-dispatcher-script-out-of-etc.patch b/0001-Move-the-NetworkManager-dispatcher-script-out-of-etc.patch new file mode 100644 index 0000000..a63c317 --- /dev/null +++ b/0001-Move-the-NetworkManager-dispatcher-script-out-of-etc.patch @@ -0,0 +1,29 @@ +From 664b65d293c948a725b9e215c13505539250ce10 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Thu, 22 Aug 2019 17:37:56 +0200 +Subject: [PATCH] Move the NetworkManager dispatcher script out of /etc + +It's not user configuration and shouldn't ever have been there. Except for that +it used to be the only location NetworkManager looked into. With NetworkManager +1.20 that is no longer the case and the dispatcher scripts can be moved to +/usr/lib. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b540bbe..625ccc7 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ TLP_BIN ?= /usr/bin + TLP_TLIB ?= /usr/share/tlp + TLP_FLIB ?= /usr/share/tlp/func.d + TLP_ULIB ?= /lib/udev +-TLP_NMDSP ?= /etc/NetworkManager/dispatcher.d ++TLP_NMDSP ?= /usr/lib/NetworkManager/dispatcher.d + TLP_CONF ?= /etc/default/tlp + TLP_SYSD ?= /lib/systemd/system + TLP_SYSV ?= /etc/init.d +-- +2.23.0 + diff --git a/tlp.spec b/tlp.spec index ce7da8c..d9cf165 100644 --- a/tlp.spec +++ b/tlp.spec @@ -1,10 +1,11 @@ Name: tlp Version: 1.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced power management tool for Linux License: GPLv2+ URL: http://linrunner.de/en/tlp/tlp.html Source0: https://github.com/linrunner/TLP/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 0001-Move-the-NetworkManager-dispatcher-script-out-of-etc.patch #Provided by Andreas Roederer : Source1: 50-tlp.preset @@ -46,7 +47,7 @@ does not contain a GUI. %package rdw Summary: Radio Device Wizard for TLP -Requires: NetworkManager +Requires: NetworkManager >= 1.20 Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -101,7 +102,7 @@ appstream-util validate-relax --nonet \ %doc COPYING README.md changelog %{_bindir}/tlp-rdw %{_mandir}/man*/tlp-rdw* -%{_sysconfdir}/NetworkManager/dispatcher.d/99tlp-rdw-nm +%{_prefix}/lib/NetworkManager/dispatcher.d/99tlp-rdw-nm %{_udevrulesdir}/85-tlp-rdw.rules %{_udevrulesdir}/../tlp-rdw-udev %{_datadir}/bash-completion/completions/tlp-rdw @@ -126,6 +127,9 @@ fi /bin/systemctl enable NetworkManager-dispatcher.service >/dev/null 2>&1 || : %changelog +* Thu Aug 22 2019 Lubomir Rintel - 1.2.2-3 +- Move the NetworkManager dispatcher script out of /etc + * Sat Jul 27 2019 Fedora Release Engineering - 1.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild