diff --git a/subversion.spec b/subversion.spec index a9b94aa..94a04db 100644 --- a/subversion.spec +++ b/subversion.spec @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0 -Release: 9%{?dist} +Release: 10%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -135,6 +135,7 @@ Subversion libraries. %{?python_provide:%python_provide python3-subversion} Summary: Python bindings for Subversion Version Control system BuildRequires: python3-devel py3c-devel +Requires: subversion-libs%{?_isa} = %{version}-%{release} %description -n python3-subversion The python3-subversion package includes the Python 3.x bindings to the @@ -386,6 +387,9 @@ sed -i "/^dependency_libs/{ s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g; }" $RPM_BUILD_ROOT%{_libdir}/*.la +# Trim libdir in pkgconfig files to avoid multilib conflicts +sed -i '/^libdir=/d' $RPM_BUILD_ROOT%{_datadir}/pkgconfig/libsvn*.pc + # Install bash completion install -Dpm 644 tools/client-side/bash_completion \ $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/svn @@ -569,6 +573,10 @@ make check-javahl %endif %changelog +* Fri Dec 11 2020 Joe Orton - 1.14.0-10 +- strip libdir from pkgconfig files +- add missing -libs dep from python3-subversion + * Thu Dec 3 2020 Joe Orton - 1.14.0-9 - fix KWallet conditional (#1902598)