From 87c81f4b369e2c7169132b53f00670a05d56aab7232c92a2405c9beef4565faf Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Thu, 22 Feb 2018 11:41:28 +0000 Subject: [PATCH] Accepting request 577191 from home:dimstar:Factory - Own %{_sysconfdir}/dbus-1/system.d and %{_sysconfdir}/dbus-1: in the past systemd happened to install things there and 'own' the directory for us, but that was just a coincidence. - Replace systemd BuildRequires with pkgconfig(systemd), allowing OBS to pick systemd-mini for the build. Addresses the build failure seen in openSUSE:Factory: [ 46s] tuned-2.8.0-2.3.noarch.rpm: directories not owned by a package: [ 46s] - /etc/dbus-1 [ 46s] - /etc/dbus-1/system.d OBS-URL: https://build.opensuse.org/request/show/577191 OBS-URL: https://build.opensuse.org/package/show/Base:System/tuned?expand=0&rev=48 --- tuned.changes | 9 +++++++++ tuned.spec | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tuned.changes b/tuned.changes index 4dd0982..aea836a 100644 --- a/tuned.changes +++ b/tuned.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 16 09:07:59 UTC 2018 - dimstar@opensuse.org + +- Own %{_sysconfdir}/dbus-1/system.d and %{_sysconfdir}/dbus-1: in + the past systemd happened to install things there and 'own' the + directory for us, but that was just a coincidence. +- Replace systemd BuildRequires with pkgconfig(systemd), allowing + OBS to pick systemd-mini for the build. + ------------------------------------------------------------------- Thu Nov 16 09:55:47 UTC 2017 - jloeser@suse.com diff --git a/tuned.spec b/tuned.spec index da0fcd6..bbf8f89 100644 --- a/tuned.spec +++ b/tuned.spec @@ -1,7 +1,7 @@ # # spec file for package tuned # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,7 +43,7 @@ Patch5: check_for_cpupower.patch BuildRequires: bash-completion BuildRequires: desktop-file-utils BuildRequires: python -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) Requires: %{_bindir}/cpupower Requires: dbus-1-python Requires: ethtool @@ -223,6 +223,8 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile %config(noreplace) %{_sysconfdir}/tuned/cpu-partitioning-variables.conf %config(noreplace) %{_sysconfdir}/tuned/tuned-main.conf %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/bootcmdline +%dir %{_sysconfdir}/dbus-1 +%dir %{_sysconfdir}/dbus-1/system.d %config %{_sysconfdir}/dbus-1/system.d/com.redhat.tuned.conf %{_sysconfdir}/grub.d %{_tmpfilesdir}/tuned.conf