From 0548ac26cd02518a95e9a442b642f411bb73f679f2829905e9c8c7af6ee2b1a7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 Dec 2016 12:36:16 +0000 Subject: [PATCH] - fix the cloud.cfg split, cyclic non-versioned dependencies are bad. also fix changelog entries - add datasourceLocalDisk.patch: * Fix datasourceLocalDisk module in case directory exists but is OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=69 --- cloud-init.changes | 9 ++++++++- cloud-init.spec | 5 ++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cloud-init.changes b/cloud-init.changes index 7c387f5..e71f894 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Thu Dec 8 12:35:51 UTC 2016 - dmueller@suse.com + +- fix the cloud.cfg split, cyclic non-versioned dependencies are + bad. also fix changelog entries + ------------------------------------------------------------------- Thu Dec 1 12:31:09 CET 2016 - kukuk@suse.de -- Fix datasourceLocalDisk module in case directory exists but is +- add datasourceLocalDisk.patch: + * Fix datasourceLocalDisk module in case directory exists but is empty. ------------------------------------------------------------------- diff --git a/cloud-init.spec b/cloud-init.spec index e0ce6df..a8d5c61 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -97,7 +97,7 @@ Requires: python-six Requires: python-xml Requires: sudo Requires: util-linux -Requires: cloud-init-config +Requires: cloud-init-config = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %define docdir %{_defaultdocdir}/%{name} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -139,8 +139,7 @@ according to the fetched configuration data from the admin node. %package config-suse Summary: Configuration file for Cloud node initialization tool -Requires: cloud-init = %{version} -Provides: cloud-init-config +Provides: cloud-init-config = %{version} Conflicts: otherproviders(cloud-init-config) %description config-suse