Properly handle CentOS Stream

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

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