diff options
| author | Todd Zullinger <tmz@pobox.com> | 2021-06-05 12:08:21 -0400 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2021-06-06 16:15:25 -0400 |
| commit | c2169ffe81720e3c80ca30b5a45d6404960342af (patch) | |
| tree | 475f20235bd66dc15187aff5caf7fc88fc926e9d | |
| parent | 7799cac7847e46d2f2e4f565f680b5a36e6ea872 (diff) | |
| download | cgit_EL6-c2169ffe81720e3c80ca30b5a45d6404960342af.tar.gz | |
clean up & improve dist conditionals
Replace a number of `EL > 7` with `EL >= 8` to make the intention
clearer. The next version of RHEL is no longer shrouded in mystery.
Move the httpd_filesystem bcond into the block for Fedora && EL8+.
| -rw-r--r-- | cgit.spec | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -15,10 +15,12 @@ # the *.py files in cgit are not importable python modules %global _python_bytecompile_extra 0 -# Settings for Fedora and EL > 7 -%if 0%{?fedora} || 0%{?rhel} > 7 +# Settings for Fedora and EL >= 8 +%if 0%{?fedora} || 0%{?rhel} >= 8 +%bcond_without httpd_filesystem %global use_perl_interpreter 1 %else +%bcond_with httpd_filesystem %global use_perl_interpreter 0 %endif @@ -29,13 +31,6 @@ %bcond_without highlight %endif -# Older epel lacks httpd-filesystem -%if 0%{?fedora} || 0%{?rhel} > 7 -%bcond_without httpd_filesystem -%else -%bcond_with httpd_filesystem -%endif - Name: cgit Version: 1.2.3 Release: 5%{?dist} @@ -229,6 +224,7 @@ make test - use %%{gpgverify} macro to verify tarball signature - use %%{build_cflags} and %%{build_ldflags} - preserve timestamps when running install +- clean up & improve dist conditionals * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild |