#21 remove explicit BR for apr-util-bdb (#2247532)
Merged 7 months ago by opohorel. Opened 7 months ago by jorton.
rpms/ jorton/git fix-apu-BR  into  rawhide

file modified
+8 -3
@@ -78,7 +78,7 @@ 

  

  Name:           git

  Version:        2.42.0

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        Fast Version Control System

  License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT

  URL:            https://git-scm.com/
@@ -192,9 +192,11 @@ 

  %if %{with tests}

  # Test suite requirements

  BuildRequires:  acl

- %if 0%{?fedora} || 0%{?rhel} >= 8

- # Needed by t5540-http-push-webdav.sh

+ %if (0%{?fedora} && 0%{?fedora} < 40) || (0%{?rhel} >= 8 && 0%{?rhel} < 10)

+ # Needed by t5540-http-push-webdav.sh; recent httpd obviates this

  BuildRequires: apr-util-bdb

+ %endif

+ %if 0%{?fedora} || 0%{?rhel} >= 8

  # Needed by t5559-http-fetch-smart-http2.sh

  BuildRequires: mod_http2

  %endif
@@ -1039,6 +1041,9 @@ 

  %{?with_docs:%{_pkgdocdir}/git-svn.html}

  

  %changelog

+ * Wed Nov  1 2023 Joe Orton <jorton@redhat.com> - 2.42.0-2

+ - remove explicit BR for apr-util-bdb (#2247532)

+ 

  * Tue Oct 03 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.42.0-1

  - update to 2.42.0

  

no initial comment

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/a3f1e871d8f34ae699a8f00bfe96d540

rebased onto abc6560

7 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/4d43892d2e254299a1c74fecf60cbc43

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/6ffccb7b881241279f3be7aeb93bee0b

I don't know how to get the Fedora CI to rerun the scratch build but per the Zuul CI output this is now safe to merge.

Current f40 has httpd-2.4.58-2.fc40 which has a hard Requires: to ensure that some DBM backend is available from apr-util, hence mod_dav should work by default.

Previously this relied on weak deps and hence git needed an explicit BuildRequires for a specific DBM backend. This will no longer be necessary.

rebased onto 7edc80f

7 months ago

And then I noticed the BR logic was wrong for RHEL. Fixed now. Unchanged for Fedora, should still be safe to merge

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/21c96ebbe20941b5ba8c6e1d1071c365

Any objection to me merging this?

Any objection to me merging this?

Zero objections on my side. I forgot to merge this, and later I thought that someone else already merged it 😬 Sorry about that

Pull-Request has been merged by opohorel

7 months ago
Metadata