Skip to content

Commit a9ec5ac

Browse files
committed
Replace sle_version with suse_version in openQA spec file
As per https://en.opensuse.org/openSUSE:Packaging_for_Leap#RPM_Distro_Version_Macros this commit substitutes sle_version to suse_version macro because the sle_version does not exist in versions with code 16 like Leap 16.0. `suse_version` seems to provide backwards compatibility with Code 15 so it is as simple as that. Alternative it would have to check whether sle_version is not defined and adjust the conditions. https://progress.opensuse.org/issues/182228
1 parent 6deeb26 commit a9ec5ac

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

dist/rpm/openQA.spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
%{nil}
2828
%endif
2929
# Run tests on openSUSE Tumbleweed and supported openSUSE Leap versions
30-
%if 0%{?suse_version} >= 1550 || ( 0%{?is_opensuse} && 0%{?sle_version} >= 150100 )
30+
%if 0%{?suse_version} >= 1550 || ( 0%{?is_opensuse} && 0%{?suse_version} >= 1500 )
3131
%ifarch x86_64
3232
%bcond_without tests
3333
%else
@@ -37,13 +37,13 @@
3737
%bcond_with tests
3838
%endif
3939
# SLE < 15 does not provide many of the dependencies for the python sub-package
40-
%if 0%{?sle_version} < 150000 && !0%{?is_opensuse}
40+
%if 0%{?suse_version} < 1500 && !0%{?is_opensuse}
4141
%bcond_with python_scripts
4242
%else
4343
%bcond_without python_scripts
4444
%endif
4545
# exclude additional sub packages that would pull in a lot of extra dependencies on SLE
46-
%if 0%{?sle_version} && !0%{?is_opensuse}
46+
%if 0%{?suse_version} && !0%{?is_opensuse}
4747
%bcond_with devel_package
4848
%bcond_with munin_package
4949
%else
@@ -104,7 +104,7 @@ BuildRequires: fdupes
104104
%if 0%{?is_opensuse}
105105
BuildRequires: openSUSE-release
106106
%endif
107-
%if 0%{?sle_version} && !0%{?is_opensuse}
107+
%if 0%{?suse_version} && !0%{?is_opensuse}
108108
BuildRequires: sles-release
109109
%endif
110110
BuildRequires: %{build_requires}

0 commit comments

Comments
 (0)