From 25830241e697031e1debac8298151b00a013e835 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 8 Apr 2022 13:42:17 -0400 Subject: [PATCH] use httpd-core for tests on Fedora >= 37 The httpd package was slimmed down per rhbz#2070517. Use the new httpd-core package for the test suite requirements on F37+. While here, adjust a nearby '# endif' comment to match reality. --- git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index e105b6c..287ef90 100644 --- a/git.spec +++ b/git.spec @@ -189,7 +189,7 @@ BuildRequires: acl # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb %endif -# endif fedora >= 27 +# endif fedora or rhel >= 8 BuildRequires: bash %if %{with cvs} BuildRequires: cvs @@ -212,7 +212,12 @@ BuildRequires: gnupg2-smime BuildRequires: highlight %endif # endif fedora or el7+ (ppc64le/x86_64) +%if 0%{?fedora} >= 37 +BuildRequires: httpd-core +%else BuildRequires: httpd +%endif +# endif fedora >= 37 %if 0%{?fedora} && ! ( 0%{?fedora} >= 35 || "%{_arch}" == "i386" || "%{_arch}" == "s390x" ) BuildRequires: jgit %endif @@ -1016,6 +1021,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Tue Apr 05 2022 Todd Zullinger - 2.36.0-0.0.rc0 - update to 2.36.0-rc0 +- use httpd-core for tests on Fedora >= 37 * Sat Jan 29 2022 Todd Zullinger - 2.35.1-1 - update to 2.35.1