From 47a35cb836bf046c693e1c67985347c35d50385f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Tue, 18 May 2021 18:46:12 +0200 Subject: [PATCH] Properly handle CentOS Stream --- package-managers/Makefile | 6 ++++++ rpm_spec/core-agent.spec.in | 3 +++ 2 files changed, 9 insertions(+) diff --git a/package-managers/Makefile b/package-managers/Makefile index 34ccebc..bd41d07 100644 --- a/package-managers/Makefile +++ b/package-managers/Makefile @@ -13,6 +13,12 @@ QUBESSTATEDIR = $(STATEDIR)/qubes ifneq (,$(wildcard /etc/fedora-release)) DIST = fc$(shell rpm --eval %{fedora}) +else ifneq (,$(wildcard /etc/centos-release)) +ifeq (CentOSStream, $(shell lsb_release -is)) +DIST = centos-stream +else +DIST = centos +endif else ifneq (,$(wildcard /etc/os-release)) DIST = $(shell grep VERSION_CODENAME= /etc/os-release | cut -d'=' -f2) endif diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 9ed6baf..698b82f 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -176,6 +176,9 @@ BuildRequires: qubes-libvchan-@BACKEND_VMM@-devel BuildRequires: pam-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: systemd +%if 0%{?rhel} >= 8 +BuildRequires: redhat-lsb +%endif Source0: %{name}-%{version}.tar.gz %description