diff --git a/nut-2.6.3-tmpfiles.patch b/nut-2.6.3-tmpfiles.patch index 7fb2e24..087d369 100644 --- a/nut-2.6.3-tmpfiles.patch +++ b/nut-2.6.3-tmpfiles.patch @@ -1,6 +1,17 @@ -diff -up nut-2.6.4/scripts/systemd/nut-monitor.service.in.tmpfiles nut-2.6.4/scripts/systemd/nut-monitor.service.in ---- nut-2.6.4/scripts/systemd/nut-monitor.service.in.tmpfiles 2012-05-02 23:35:36.000000000 +0200 -+++ nut-2.6.4/scripts/systemd/nut-monitor.service.in 2012-06-14 11:38:42.408504102 +0200 +diff -up nut-2.7.4/scripts/systemd/nut-driver.service.in.tmpfiles nut-2.7.4/scripts/systemd/nut-driver.service.in +--- nut-2.7.4/scripts/systemd/nut-driver.service.in.tmpfiles 2016-08-11 16:58:00.759001400 +0200 ++++ nut-2.7.4/scripts/systemd/nut-driver.service.in 2016-08-11 16:58:38.619248466 +0200 +@@ -4,6 +4,7 @@ After=local-fs.target network.target + StopWhenUnneeded=yes + + [Service] ++ExecStartPre=-/usr/bin/systemd-tmpfiles --create /etc/tmpfiles.d/nut-client.conf + ExecStart=@SBINDIR@/upsdrvctl start + ExecStop=@SBINDIR@/upsdrvctl stop + Type=forking +diff -up nut-2.7.4/scripts/systemd/nut-monitor.service.in.tmpfiles nut-2.7.4/scripts/systemd/nut-monitor.service.in +--- nut-2.7.4/scripts/systemd/nut-monitor.service.in.tmpfiles 2015-12-29 09:42:34.000000000 +0100 ++++ nut-2.7.4/scripts/systemd/nut-monitor.service.in 2016-08-11 16:57:48.121918934 +0200 @@ -3,6 +3,7 @@ Description=Network UPS Tools - power de After=local-fs.target network.target nut-server.service diff --git a/nut.spec b/nut.spec index 5d22b66..6a1b498 100644 --- a/nut.spec +++ b/nut.spec @@ -16,7 +16,7 @@ Summary: Network UPS Tools Name: nut Version: 2.7.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/System License: GPLv2+ and GPLv3+ Url: http://www.networkupstools.org/ @@ -436,6 +436,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Thu Aug 11 2016 Michal Hlavinka - 2.7.4-3 +- make sure tmpfiles creation is executped before ups driver (#1365904,#1349362) + * Tue Jul 19 2016 Fedora Release Engineering - 2.7.4-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages