diff --git a/tlp.spec b/tlp.spec index 7150e1c..6c2ea0c 100644 --- a/tlp.spec +++ b/tlp.spec @@ -1,6 +1,6 @@ Name: tlp Version: 0.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Advanced power management tool for Linux License: GPLv2+ URL: http://linrunner.de/tlp @@ -63,7 +63,8 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_presetdir}/50-tlp.preset #Install systemd services: install -D -m 644 tlp.service %{buildroot}%{_unitdir}/tlp.service install -D -m 644 tlp-sleep.service %{buildroot}%{_unitdir}/tlp-sleep.service -ln -sf /dev/null %{buildroot}%{_unitdir}/systemd-rfkill@.service +#THIS IS A WORKAROUND FOR RFKILL! +ln -sf /dev/null %{buildroot}%{_sysconfdir}/systemd/system/systemd-rfkill@.service %files %config(noreplace) %{_sysconfdir}/default/tlp @@ -79,6 +80,8 @@ ln -sf /dev/null %{buildroot}%{_unitdir}/systemd-rfkill@.service %{_datadir}/bash-completion/completions/tlp %{_presetdir}/50-tlp.preset %{_unitdir}/*.service +#THIS IS A WORKAROUND FOR RFKILL! +%{_sysconfdir}/systemd/system/systemd-rfkill@.service #The following is not supported by fedora's kernel: %exclude %{_sysconfdir}/acpi/events/thinkpad-radiosw %exclude %{_sysconfdir}/acpi/thinkpad-radiosw.sh @@ -105,6 +108,9 @@ ln -sf /dev/null %{buildroot}%{_unitdir}/systemd-rfkill@.service /bin/systemctl enable NetworkManager-dispatcher.service >/dev/null 2>&1 || : %changelog +* Mon May 11 2015 Jeremy Newton - 0.7-4 +- Use workaround to avoid conflict with systemd + * Mon May 11 2015 Jeremy Newton - 0.7-3 - Fix rfkill conflict