From cd23205773943e58a762d710d7ff1f30aebd331db1afd6d95800d1e168468abd Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 5 Jul 2019 18:59:55 +0000 Subject: [PATCH] - Follow the ever changing inconsistencies of version definitions and detection in the build service. + No more suse_version in SUSE internal instance for SLES 15 SP1 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=142 --- cloud-init.changes | 7 +++++++ cloud-init.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/cloud-init.changes b/cloud-init.changes index 6d510a6..2c1146d 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 5 18:58:22 UTC 2019 - Robert Schweikert + +- Follow the ever changing inconsistencies of version definitions and + detection in the build service. + + No more suse_version in SUSE internal instance for SLES 15 SP1 + ------------------------------------------------------------------- Tue Jun 11 12:37:16 UTC 2019 - Dominique Leuenberger diff --git a/cloud-init.spec b/cloud-init.spec index aeb9233..61505c2 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -75,11 +75,15 @@ BuildRequires: python-requests BuildRequires: python-setuptools BuildRequires: python-six %endif +%if 0%{?sle_version} +BuildRequires: sles-release +%else %if 0%{?is_opensuse} || 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320 BuildRequires: openSUSE-release %else BuildRequires: sles-release %endif +%endif BuildRequires: util-linux Requires: bash Requires: dhcp-client