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

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/curl.git#1cfc0aeb3b0803992927a289aec9140acc107853
This commit is contained in:
DistroBaker 2021-01-26 15:41:57 +00:00
parent a16bb47a53
commit 2174528c27
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
curl.spec
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.74.0 Version: 7.74.0
Release: 2%{?dist} Release: 4%{?dist}
License: MIT License: MIT
Source: https://curl.se/download/%{name}-%{version}.tar.xz Source: https://curl.se/download/%{name}-%{version}.tar.xz
@ -42,7 +42,6 @@ BuildRequires: pkgconfig
BuildRequires: python-unversioned-command BuildRequires: python-unversioned-command
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: sed BuildRequires: sed
BuildRequires: stunnel
BuildRequires: zlib-devel BuildRequires: zlib-devel
# needed to compress content of tool_hugehelp.c after changing curl.1 man page # needed to compress content of tool_hugehelp.c after changing curl.1 man page
@ -89,6 +88,12 @@ BuildRequires: python3-impacket
BuildRequires: valgrind BuildRequires: valgrind
%endif %endif
# stunnel is used by upstream tests but it does not seem to work reliably
# on s390x and occasionally breaks some tests (mainly 1561 and 1562)
%ifnarch s390x
BuildRequires: stunnel
%endif
# 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}
@ -348,6 +353,12 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
%changelog %changelog
* Tue Jan 26 2021 Kamil Dudka <kdudka@redhat.com> - 7.74.0-4
- do not use stunnel for tests on s390x builds to avoid spurious failures
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.74.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Dec 09 2020 Kamil Dudka <kdudka@redhat.com> - 7.74.0-2 * Wed Dec 09 2020 Kamil Dudka <kdudka@redhat.com> - 7.74.0-2
- do not rewrite shebangs in test-suite to use python3 explicitly - do not rewrite shebangs in test-suite to use python3 explicitly