rpms/subversion
5
0
Fork 0
Code Issues Pull Requests Releases Activity

strip libdir from pkgconfig files

Browse Source 
add missing -libs dep from python3-subversion
This commit is contained in:
Joe Orton 2020-12-11 16:58:50 +00:00
parent fcaaaff855
commit 9e1c54f621
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subversion.spec
View File

@ -56,7 +56,7 @@
Summary: A Modern Concurrent Version Control System Summary: A Modern Concurrent Version Control System
Name: subversion Name: subversion
Version: 1.14.0 Version: 1.14.0
Release: 9%{?dist} Release: 10%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: https://subversion.apache.org/ URL: https://subversion.apache.org/
@ -135,6 +135,7 @@ Subversion libraries.
%{?python_provide:%python_provide python3-subversion} %{?python_provide:%python_provide python3-subversion}
Summary: Python bindings for Subversion Version Control system Summary: Python bindings for Subversion Version Control system
BuildRequires: python3-devel py3c-devel BuildRequires: python3-devel py3c-devel
Requires: subversion-libs%{?_isa} = %{version}-%{release}
%description -n python3-subversion %description -n python3-subversion
The python3-subversion package includes the Python 3.x bindings to the 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; s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g;
}" $RPM_BUILD_ROOT%{_libdir}/*.la }" $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 bash completion
install -Dpm 644 tools/client-side/bash_completion \ install -Dpm 644 tools/client-side/bash_completion \
$RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/svn $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/svn
@ -569,6 +573,10 @@ make check-javahl
%endif %endif
%changelog %changelog
* Fri Dec 11 2020 Joe Orton <jorton@redhat.com> - 1.14.0-10
- strip libdir from pkgconfig files
- add missing -libs dep from python3-subversion
* Thu Dec 3 2020 Joe Orton <jorton@redhat.com> - 1.14.0-9 * Thu Dec 3 2020 Joe Orton <jorton@redhat.com> - 1.14.0-9
- fix KWallet conditional (#1902598) - fix KWallet conditional (#1902598)