rpms/curl
8
0
Fork 1
Code Issues Pull Requests Releases Activity

Resolves: #1631804 - enforce versioned libpsl dependency for libcurl

Browse Source
This commit is contained in:
Kamil Dudka 2018-10-05 13:59:35 +02:00
parent 84125cbefe
commit 800bb58ef3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
curl.spec
View File

@ -79,6 +79,10 @@ BuildRequires: valgrind
# using an older version of libcurl could result in CURLE_UNKNOWN_OPTION # using an older version of libcurl could result in CURLE_UNKNOWN_OPTION
Requires: libcurl%{?_isa} >= %{version}-%{release} Requires: libcurl%{?_isa} >= %{version}-%{release}
# require at least the version of libpsl that we were built against,
# to ensure that we have the necessary symbols available (#1631804)
%global libpsl_version %(pkg-config --modversion libpsl 2>/dev/null || echo 0)
# require at least the version of libssh that we were built against, # require at least the version of libssh that we were built against,
# to ensure that we have the necessary symbols available (#525002, #642796) # to ensure that we have the necessary symbols available (#525002, #642796)
%global libssh_version %(pkg-config --modversion libssh 2>/dev/null || echo 0) %global libssh_version %(pkg-config --modversion libssh 2>/dev/null || echo 0)
@ -97,6 +101,7 @@ resume, proxy tunneling and a busload of other useful tricks.
%package -n libcurl %package -n libcurl
Summary: A library for getting files from web servers Summary: A library for getting files from web servers
Requires: libpsl%{?_isa} >= %{libpsl_version}
Requires: libssh%{?_isa} >= %{libssh_version} Requires: libssh%{?_isa} >= %{libssh_version}
Requires: openssl-libs%{?_isa} >= 1:%{openssl_version} Requires: openssl-libs%{?_isa} >= 1:%{openssl_version}
Provides: libcurl-full = %{version}-%{release} Provides: libcurl-full = %{version}-%{release}
@ -326,6 +331,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
%changelog %changelog
* Thu Oct 04 2018 Kamil Dudka <kdudka@redhat.com> - 7.61.1-2 * Thu Oct 04 2018 Kamil Dudka <kdudka@redhat.com> - 7.61.1-2
- enforce versioned libpsl dependency for libcurl (#1631804)
- test320: update expected output for gnutls-3.6.4 - test320: update expected output for gnutls-3.6.4
- drop 0105-curl-7.61.0-tests-ssh-keygen.patch no longer needed (#1622594) - drop 0105-curl-7.61.0-tests-ssh-keygen.patch no longer needed (#1622594)