Resolves: #1462184 - enforce versioned openssl-libs dependency for libcurl

This commit is contained in:
Kamil Dudka 2017-06-19 13:28:00 +02:00
parent 0aa20e6c92
commit 18e7a55066

View File

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl Name: curl
Version: 7.54.1 Version: 7.54.1
Release: 1%{?dist} Release: 2%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source: https://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@ -72,6 +72,10 @@ Requires: libcurl%{?_isa} >= %{version}-%{release}
# to ensure that we have the necessary symbols available (#525002, #642796) # to ensure that we have the necessary symbols available (#525002, #642796)
%global libssh2_version %(pkg-config --modversion libssh2 2>/dev/null || echo 0) %global libssh2_version %(pkg-config --modversion libssh2 2>/dev/null || echo 0)
# require at least the version of openssl-libs that we were built against,
# to ensure that we have the necessary symbols available (#1462184, #1462211)
%global openssl_version %(pkg-config --modversion openssl 2>/dev/null || echo 0)
%description %description
curl is a command line tool for transferring data with URL syntax, supporting curl is a command line tool for transferring data with URL syntax, supporting
FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS, FILE, IMAP, FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS, FILE, IMAP,
@ -84,6 +88,7 @@ resume, proxy tunneling and a busload of other useful tricks.
Summary: A library for getting files from web servers Summary: A library for getting files from web servers
Group: Development/Libraries Group: Development/Libraries
Requires: libssh2%{?_isa} >= %{libssh2_version} Requires: libssh2%{?_isa} >= %{libssh2_version}
Requires: openssl-libs%{?_isa} >= 1:%{openssl_version}
Provides: libcurl-full = %{version}-%{release} Provides: libcurl-full = %{version}-%{release}
Provides: libcurl-full%{?_isa} = %{version}-%{release} Provides: libcurl-full%{?_isa} = %{version}-%{release}
@ -126,6 +131,7 @@ be installed.
%package -n libcurl-minimal %package -n libcurl-minimal
Summary: Conservatively configured build of libcurl for minimal installations Summary: Conservatively configured build of libcurl for minimal installations
Requires: openssl-libs%{?_isa} >= 1:%{openssl_version}
Provides: libcurl = %{version}-%{release} Provides: libcurl = %{version}-%{release}
Provides: libcurl%{?_isa} = %{version}-%{release} Provides: libcurl%{?_isa} = %{version}-%{release}
Conflicts: libcurl Conflicts: libcurl
@ -296,6 +302,9 @@ install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
%{_libdir}/libcurl.so.[0-9].[0-9].[0-9].minimal %{_libdir}/libcurl.so.[0-9].[0-9].[0-9].minimal
%changelog %changelog
* Mon Jun 19 2017 Kamil Dudka <kdudka@redhat.com> 7.54.1-2
- enforce versioned openssl-libs dependency for libcurl (#1462184)
* Wed Jun 14 2017 Kamil Dudka <kdudka@redhat.com> 7.54.1-1 * Wed Jun 14 2017 Kamil Dudka <kdudka@redhat.com> 7.54.1-1
- new upstream release - new upstream release