From 163817aa630e5adef9a1a9903b4397af7411f6fee1a73f546eef60b0c940a490 Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Fri, 28 Oct 2016 04:56:57 +0000 Subject: [PATCH] Do not own /lib/udev to not conflict with udev rpm OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=55 --- cloud-init.changes | 5 +++++ cloud-init.spec | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cloud-init.changes b/cloud-init.changes index 3d93541..bc6f483 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 28 04:56:29 UTC 2016 - bwiedemann@suse.com + +- Do not own /lib/udev to not conflict with udev rpm + ------------------------------------------------------------------- Thu Oct 27 19:40:31 UTC 2016 - rjschwei@suse.com diff --git a/cloud-init.spec b/cloud-init.spec index e402206..c79d453 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -55,6 +55,8 @@ BuildRequires: python-devel BuildRequires: python-setuptools # pkg-config is needed to find correct systemd unit dir BuildRequires: pkg-config +# needed for /lib/udev +BuildRequires: udev %if 0%{?suse_version} > 1320 # Test requirements BuildRequires: python-Cheetah @@ -293,13 +295,7 @@ popd # This if condition really distinquished between OBS and IBS. # For SLE 12 builds in OBS owning the directories is not required, while # SLE 12 builds in IBS require owning the directories -%if 0%{?suse_version} && 0%{?suse_version} <= 1325 -%dir /usr/lib/udev -%dir /usr/lib/udev/rules.d -%endif %else -%dir /lib/udev -%dir /lib/udev/rules.d /lib/udev/rules.d/66-azure-ephemeral.rules %endif %dir %attr(0755, root, root) %{_localstatedir}/lib/cloud