Accepting request 734787 from home:juliogonzalezgil:branches:openSUSE:Tools

- Fix building and installation for CentOS8, RHEL8 and RES8

OBS-URL: https://build.opensuse.org/request/show/734787
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=264
This commit is contained in:
Alberto Planas 2019-10-21 13:28:55 +00:00 committed by Git OBS Bridge
parent d80935a506
commit 69a290a341
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 1 10:12:16 UTC 2019 - Julio González Gil <jgonzalez@suse.com>
- Fix building and installation for CentOS8, RHEL8 and RES8
-------------------------------------------------------------------
Thu Aug 22 11:25:57 UTC 2019 - FSchreiner@suse.com

View File

@ -22,7 +22,7 @@
%bcond_with obs_scm_testsuite
%endif
%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29
%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?rhel} >= 8
%bcond_without python3
%else
%bcond_with python3
@ -53,14 +53,14 @@
%endif
%endif
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version}
%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} || 0%{?rhel}
%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?rhel} >= 8
%define pyyaml_package %{use_python}-PyYAML
%else
%define pyyaml_package PyYAML
%endif
%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800
%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?rhel} >= 8
%define locale_package glibc-langpack-en
%else
%define locale_package glibc-common