From d5080520956d7332613df5c1d75e111c47cfc096ed07c9bbd41b12b3a71502bd Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 13 Dec 2021 10:56:23 +0000 Subject: [PATCH] - simplifiy conditions for all rhel like distros to skip testsuite OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=116 --- obs-service-set_version.changes | 5 +++++ obs-service-set_version.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index 1672725..4258a54 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 13 10:46:10 UTC 2021 - Dirk Müller + +- simplifiy conditions for all rhel like distros to skip testsuite + ------------------------------------------------------------------- Wed Jul 14 09:32:33 UTC 2021 - FSchreiner@suse.com diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 2d5a455..f152af3 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -1,5 +1,5 @@ # -# spec file for package obs-service-set_version +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -16,14 +16,14 @@ # -%if 0%{?centos_version} || 0%{?almalinux} || 0%{?rocky} || ( 0%{?suse_version} && 0%{?suse_version} <= 1315 ) +%if 0%{?rhel} || ( 0%{?suse_version} && 0%{?suse_version} <= 1315 ) %bcond_with obs_scm_testsuite %else %bcond_without obs_scm_testsuite %endif %define service set_version -%if 0%{?suse_version} > 1315 || 0%{?fedora_version} || 0%{?centos_version} >= 800 || 0%{?almalinux} >= 8 || 0%{?mageia} >= 8 || 0%{?rocky} >= 8 +%if 0%{?suse_version} > 1315 || 0%{?fedora_version} || 0%{?rhel} >= 8 %define use_python python3 %else %define use_python python