From ce40b308af963aef7529fccf819b8cb884d9892e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 15 Feb 2022 22:38:03 +0100
Subject: [PATCH] added more conflicting services to the systemd service file

  resolves: rhbz#2053919
---
 tuned-2.18.0-conflicting-services.patch | 24 ++++++++++++++++++++++++
 tuned.spec                              |  7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tuned-2.18.0-conflicting-services.patch

diff --git a/tuned-2.18.0-conflicting-services.patch b/tuned-2.18.0-conflicting-services.patch
new file mode 100644
index 0000000..fda5d2c
--- /dev/null
+++ b/tuned-2.18.0-conflicting-services.patch
@@ -0,0 +1,24 @@
+From 4992d1b8f41561ba8baec23a3da13d202a82b09f Mon Sep 17 00:00:00 2001
+From: Vitaly Zaitsev <vitaly@easycoding.org>
+Date: Sun, 13 Feb 2022 11:33:55 +0100
+Subject: [PATCH] Added more conflicting implementations to the systemd unit
+ file.
+
+Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>
+---
+ tuned.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tuned.service b/tuned.service
+index 0d6c3c83..c822c105 100644
+--- a/tuned.service
++++ b/tuned.service
+@@ -2,7 +2,7 @@
+ Description=Dynamic System Tuning Daemon
+ After=systemd-sysctl.service network.target dbus.service
+ Requires=dbus.service polkit.service
+-Conflicts=cpupower.service
++Conflicts=cpupower.service auto-cpufreq.service tlp.service power-profiles-daemon.service
+ Documentation=man:tuned(8) man:tuned.conf(5) man:tuned-adm(8)
+ 
+ [Service]
diff --git a/tuned.spec b/tuned.spec
index 01c411a..5f0d4df 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -35,7 +35,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 2.18.0
-Release: 1%{?prerel1}%{?dist}
+Release: 2%{?prerel1}%{?dist}
 License: GPLv2+
 Source0: https://github.com/redhat-performance/%{name}/archive/v%{version}%{?prerel2}/%{name}-%{version}%{?prerel2}.tar.gz
 URL: http://www.tuned-project.org/
@@ -95,6 +95,7 @@ Recommends: subscription-manager
 Requires: python3-syspurpose
 %endif
 %endif
+Patch0: tuned-2.18.0-conflicting-services.patch
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -542,6 +543,10 @@ fi
 %{_mandir}/man7/tuned-profiles-openshift.7*
 
 %changelog
+* Tue Feb 15 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2.18.0-2
+- added more conflicting services to the systemd service file
+  resolves: rhbz#2053919
+
 * Wed Feb  9 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2.18.0-1
 - new release
   - rebased tuned to latest upstream