From 132a9d6206f710d14ae7fbfe03b50b69fa77c5d6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Nov 27 2019 14:37:36 +0000 Subject: Also patch the thinkfan.service cmake template in thinkfan_systemd.patch --- diff --git a/thinkfan.spec b/thinkfan.spec index 90f2b3e..d457307 100644 --- a/thinkfan.spec +++ b/thinkfan.spec @@ -1,6 +1,6 @@ Name: thinkfan Version: 1.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A simple fan control program License: GPLv3+ @@ -78,6 +78,9 @@ rm -f %{buildroot}/%{_pkgdocdir}/COPYING %changelog +* Wed Nov 27 2019 Sandro Mani - 1.0.2-6 +- Also patch the thinkfan.service cmake template in thinkfan_systemd.patch + * Sun Nov 17 2019 Sandro Mani - 1.0.2-5 - Bump F31/F30 for yaml-cpp rebuild diff --git a/thinkfan_systemd.patch b/thinkfan_systemd.patch index 1f5586a..df8f7b1 100644 --- a/thinkfan_systemd.patch +++ b/thinkfan_systemd.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference thinkfan-1.0.2/CMakeLists.txt thinkfan-1.0.2-new/CMakeLists.txt --- thinkfan-1.0.2/CMakeLists.txt 2019-02-27 12:07:02.000000000 +0100 -+++ thinkfan-1.0.2-new/CMakeLists.txt 2019-11-13 19:56:09.059306641 +0100 ++++ thinkfan-1.0.2-new/CMakeLists.txt 2019-11-27 15:37:21.042169917 +0100 @@ -121,17 +121,7 @@ if(SYSTEMD_FOUND) install(FILES rcscripts/systemd/thinkfan-wakeup.service @@ -22,7 +22,7 @@ diff -rupN --no-dereference thinkfan-1.0.2/CMakeLists.txt thinkfan-1.0.2-new/CMa if(OPENRC_FOUND) diff -rupN --no-dereference thinkfan-1.0.2/rcscripts/systemd/thinkfan.service thinkfan-1.0.2-new/rcscripts/systemd/thinkfan.service --- thinkfan-1.0.2/rcscripts/systemd/thinkfan.service 2019-02-27 12:07:02.000000000 +0100 -+++ thinkfan-1.0.2-new/rcscripts/systemd/thinkfan.service 2019-11-13 19:56:09.059306641 +0100 ++++ thinkfan-1.0.2-new/rcscripts/systemd/thinkfan.service 2019-11-27 15:37:21.042169917 +0100 @@ -2,8 +2,8 @@ Description=Thinkfan, the minimalist fan control program @@ -34,3 +34,17 @@ diff -rupN --no-dereference thinkfan-1.0.2/rcscripts/systemd/thinkfan.service th PIDFile=/run/thinkfan.pid ExecReload=/bin/kill -HUP $MAINPID +diff -rupN --no-dereference thinkfan-1.0.2/rcscripts/systemd/thinkfan.service.cmake thinkfan-1.0.2-new/rcscripts/systemd/thinkfan.service.cmake +--- thinkfan-1.0.2/rcscripts/systemd/thinkfan.service.cmake 2019-02-27 12:07:02.000000000 +0100 ++++ thinkfan-1.0.2-new/rcscripts/systemd/thinkfan.service.cmake 2019-11-27 15:37:21.042169917 +0100 +@@ -2,8 +2,8 @@ + Description=Thinkfan, the minimalist fan control program + + [Service] +-Type=forking +-ExecStart=@CMAKE_INSTALL_PREFIX@/sbin/thinkfan $THINKFAN_ARGS ++EnvironmentFile=-/etc/sysconfig/thinkfan ++ExecStart=@CMAKE_INSTALL_PREFIX@/sbin/thinkfan -n $OPTIONS + PIDFile=/run/thinkfan.pid + ExecReload=/bin/kill -HUP $MAINPID +