PR#13: Apply makecache systemd unit patch to resolve bug #1652655 - rpms/dnf

Apply makecache systemd unit patch to resolve bug #1652655

Tim Landscheidt • 4 years ago

476ec57

0005-Align-systemd-config-with-documented-options.patch

file added

+34

		`@@ -0,0 +1,34 @@`
		`+ From 27a4c9de230258dbc6ee9d9d06f63403d1672011 Mon Sep 17 00:00:00 2001`
		`+ From: Peter Oliver <git@mavit.org.uk>`
		`+ Date: Thu, 21 Jun 2018 12:31:23 +0100`
		`+ Subject: [PATCH] Align systemd config with documented options`
		`+`
		`+ ---`
		`+ etc/systemd/dnf-makecache.service \| 2 +-`
		`+ etc/systemd/dnf-makecache.timer \| 2 +-`
		`+ 2 files changed, 2 insertions(+), 2 deletions(-)`
		`+`
		`+ diff --git a/etc/systemd/dnf-makecache.service b/etc/systemd/dnf-makecache.service`
		`+ index 4a280c8f..a18fe798 100644`
		`+ --- a/etc/systemd/dnf-makecache.service`
		`+ +++ b/etc/systemd/dnf-makecache.service`
		`+ @@ -11,4 +11,4 @@ Nice=19`
		`+ IOSchedulingClass=2`
		`+ IOSchedulingPriority=7`
		`+ Environment="ABRT_IGNORE_PYTHON=1"`
		`+ -ExecStart=/usr/bin/dnf makecache timer`
		`+ +ExecStart=/usr/bin/dnf makecache --timer`
		`+ diff --git a/etc/systemd/dnf-makecache.timer b/etc/systemd/dnf-makecache.timer`
		`+ index 5005ca8a..72b6b78c 100644`
		`+ --- a/etc/systemd/dnf-makecache.timer`
		`+ +++ b/etc/systemd/dnf-makecache.timer`
		`+ @@ -1,5 +1,5 @@`
		`+ [Unit]`
		`+ -Description=dnf makecache timer`
		`+ +Description=dnf makecache --timer`
		`+ ConditionKernelCommandLine=!rd.live.image`
		`+ # See comment in dnf-makecache.service`
		`+ ConditionPathExists=!/run/ostree-booted`
		`+ --`
		`+ 2.17.2`
		`+`

dnf.spec

file modified

+5 -1

		`@@ -72,7 +72,7 @@`

		`Name: dnf`
		`Version: 2.7.5`
		`- Release: 15%{?dist}`
		`+ Release: 16%{?dist}`
		`Summary: %{pkg_summary}`
		`# For a breakdown of the licensing, see PACKAGE-LICENSING`
		`License: GPLv2+ and GPLv2 and GPL`
		`@@ -82,6 +82,7 @@`
		`Patch1: 0002-Remove-redundant-conf-option-cacheonly.patch`
		`Patch2: 0003-Remove-unnecessary-code-for-set-cacheonly.patch`
		`Patch3: 0004-util-Correctly-source-errno.EEXIST.patch`
		`+ Patch4: 0005-Align-systemd-config-with-documented-options.patch`
		`BuildArch: noarch`
		`BuildRequires: cmake`
		`BuildRequires: gettext`
		`@@ -463,6 +464,9 @@`
		`%endif`

		`%changelog`
		`+ * Thu Nov 22 2018 Tim Landscheidt <tim@tim-landscheidt.de> - 2.7.5-16`
		`+ - Apply Align-systemd-config-with-documented-options patch (RHBZ #1652655).`
		`+`
		`* Tue May 29 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-15`
		`- Apply util-Correctly-source-errno.EEXIST patch`