diff --git a/systemd.spec b/systemd.spec index 34233ef..9a13366 100644 --- a/systemd.spec +++ b/systemd.spec @@ -173,13 +173,13 @@ BuildRequires: python3dist(pillow) BuildRequires: python3dist(pytest-flakes) %endif BuildRequires: python3dist(pytest) -%if 0%{!?el8} +%if %{undefined rhel} || %{rhel} > 8 BuildRequires: python3dist(zstd) %endif # gzip and lzma are provided by the stdlib BuildRequires: firewalld-filesystem BuildRequires: libseccomp-devel -%if 0%{?el8} +%if %{defined rhel} && %{rhel} < 9 BuildRequires: meson >= 0.57 %else BuildRequires: meson >= 0.43 @@ -192,7 +192,7 @@ BuildRequires: perl BuildRequires: perl(IPC::SysV) # %generate_buildrequires doesn't work on c8s so we just add all of them as # BuildRequires instead. -%if 0%{?el8} +%if %{defined rhel} && %{rhel} < 9 BuildRequires: gnu-efi BuildRequires: gnu-efi-devel BuildRequires: python3dist(pyelftools) @@ -403,7 +403,7 @@ It also contains tools to manage encrypted home areas and secrets bound to the machine, and to create or grow partitions and make file systems automatically. %if 0%{?have_gnu_efi} -%if 0%{!?el8} +%if %{undefined rhel} || %{rhel} > 8 %package ukify Summary: Tool to build Unified Kernel Images Requires: %{name} = %{version}-%{release} @@ -602,7 +602,7 @@ sed -r 's|/system/|/user/|g' %{SOURCE16} >10-timeout-abort.conf.user mkdir selinux cp %SOURCE100 %SOURCE101 %SOURCE102 %SOURCE103 selinux -%if 0%{!?el8} +%if %{undefined rhel} || %{rhel} > 8 %generate_buildrequires %if 0%{?have_gnu_efi} if grep -q gnu-efi meson_options.txt; then @@ -1232,7 +1232,7 @@ fi %files udev -f .file-list-udev %if 0%{?have_gnu_efi} -%if 0%{!?el8} +%if %{undefined rhel} || %{rhel} > 8 %files ukify -f .file-list-ukify %endif %files boot-unsigned -f .file-list-boot @@ -1263,7 +1263,10 @@ fi %changelog -* Mon Jul 17 2023 Daan De Meyer - 253.5-1.1 +* Tue Jul 18 2023 Daan De Meyer - 253.5-1.1 +- Use the %rhel macro for checks instead of explicitly checking against %el8. + +* Mon Jul 17 2023 Daan De Meyer - 253.5-1.1 - Add back python3-zstd on c9s now that it's been added to EPEL 9 - Add back support for c8s builds (without ukify) - Add full backport of bpftool version requirement lowering