diff --git a/subversion.spec b/subversion.spec index 173cafd..379c17a 100644 --- a/subversion.spec +++ b/subversion.spec @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -180,6 +180,7 @@ passwords in the KDE Wallet. %package -n mod_dav_svn Summary: Apache httpd module for Subversion server Requires: httpd-mmn = %{_httpd_mmn} +Conflicts: httpd-core < 2.4.62-5 Requires: subversion-libs%{?_isa} = %{version}-%{release} BuildRequires: httpd-devel >= 2.4.62-5 @@ -587,6 +588,10 @@ make check-javahl %endif %changelog +* Thu Jul 10 2025 Joe Orton - 1.14.1-7 +- mod_dav_svn: add conflicts to ensure compatible mod_dav + Related: RHEL-79948 + * Wed Jul 09 2025 Joe Orton - 1.14.1-6 - mod_dav_svn: inherit DavBasePath from httpd Resolves: RHEL-79948