From 69a290a3413fe3136ccaf950a4c86dbfdb2564b4a10441f458cd164926bd50d0 Mon Sep 17 00:00:00 2001 From: Alberto Planas Dominguez Date: Mon, 21 Oct 2019 13:28:55 +0000 Subject: [PATCH] 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 --- obs-service-tar_scm.changes | 5 +++++ obs-service-tar_scm.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 8b0623a..ffead5d 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 10:12:16 UTC 2019 - Julio González Gil + +- Fix building and installation for CentOS8, RHEL8 and RES8 + ------------------------------------------------------------------- Thu Aug 22 11:25:57 UTC 2019 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index aa83aa6..3657d5a 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -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