Eliminate use of obsolete %patchN syntax
Resolves: RHEL-65667
This commit is contained in:
parent
ddedee94fe
commit
a29ff5a08e
126
curl.spec
126
curl.spec
@ -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.61.1
|
Version: 7.61.1
|
||||||
Release: 34%{?dist}.2
|
Release: 34%{?dist}.3
|
||||||
License: MIT
|
License: MIT
|
||||||
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
|
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
@ -344,82 +344,82 @@ be installed.
|
|||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch1 -p1
|
%patch -P 1 -p1
|
||||||
%patch2 -p1
|
%patch -P 2 -p1
|
||||||
%patch3 -p1
|
%patch -P 3 -p1
|
||||||
git init
|
git init
|
||||||
git apply %{PATCH4}
|
git apply %{PATCH4}
|
||||||
%patch5 -p1
|
%patch -P 5 -p1
|
||||||
%patch6 -p1
|
%patch -P 6 -p1
|
||||||
%patch7 -p1
|
%patch -P 7 -p1
|
||||||
%patch8 -p1
|
%patch -P 8 -p1
|
||||||
%patch9 -p1
|
%patch -P 9 -p1
|
||||||
%patch10 -p1
|
%patch -P 10 -p1
|
||||||
%patch11 -p1
|
%patch -P 11 -p1
|
||||||
%patch14 -p1
|
%patch -P 14 -p1
|
||||||
|
|
||||||
# Fedora patches
|
# Fedora patches
|
||||||
%patch101 -p1
|
%patch -P 101 -p1
|
||||||
%patch102 -p1
|
%patch -P 102 -p1
|
||||||
%patch103 -p1
|
%patch -P 103 -p1
|
||||||
%patch104 -p1
|
%patch -P 104 -p1
|
||||||
|
|
||||||
# use different port range for 32bit and 64bit builds, thus make it possible
|
# use different port range for 32bit and 64bit builds, thus make it possible
|
||||||
# to run both the builds in parallel on the same machine
|
# to run both the builds in parallel on the same machine
|
||||||
%patch105 -p1
|
%patch -P 105 -p1
|
||||||
sed -e 's|%%HTTPPORT|%{?__isa_bits}90|g' -i tests/data/test1448
|
sed -e 's|%%HTTPPORT|%{?__isa_bits}90|g' -i tests/data/test1448
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch17 -p1
|
%patch -P 17 -p1
|
||||||
%patch18 -p1
|
%patch -P 18 -p1
|
||||||
%patch19 -p1
|
%patch -P 19 -p1
|
||||||
%patch20 -p1
|
%patch -P 20 -p1
|
||||||
%patch21 -p1
|
%patch -P 21 -p1
|
||||||
%patch22 -p1
|
%patch -P 22 -p1
|
||||||
%patch23 -p1
|
%patch -P 23 -p1
|
||||||
%patch24 -p1
|
%patch -P 24 -p1
|
||||||
%patch25 -p1
|
%patch -P 25 -p1
|
||||||
%patch26 -p1
|
%patch -P 26 -p1
|
||||||
%patch27 -p1
|
%patch -P 27 -p1
|
||||||
%patch28 -p1
|
%patch -P 28 -p1
|
||||||
%patch29 -p1
|
%patch -P 29 -p1
|
||||||
%patch30 -p1
|
%patch -P 30 -p1
|
||||||
%patch31 -p1
|
%patch -P 31 -p1
|
||||||
%patch32 -p1
|
%patch -P 32 -p1
|
||||||
%patch33 -p1
|
%patch -P 33 -p1
|
||||||
%patch34 -p1
|
%patch -P 34 -p1
|
||||||
%patch35 -p1
|
%patch -P 35 -p1
|
||||||
%patch36 -p1
|
%patch -P 36 -p1
|
||||||
%patch37 -p1
|
%patch -P 37 -p1
|
||||||
|
|
||||||
%patch38 -p1
|
%patch -P 38 -p1
|
||||||
sed -e 's|:8992/|:%{?__isa_bits}92/|g' -i tests/data/test97{3..6}
|
sed -e 's|:8992/|:%{?__isa_bits}92/|g' -i tests/data/test97{3..6}
|
||||||
|
|
||||||
%patch39 -p1
|
%patch -P 39 -p1
|
||||||
%patch40 -p1
|
%patch -P 40 -p1
|
||||||
%patch41 -p1
|
%patch -P 41 -p1
|
||||||
%patch42 -p1
|
%patch -P 42 -p1
|
||||||
%patch43 -p1
|
%patch -P 43 -p1
|
||||||
%patch44 -p1
|
%patch -P 44 -p1
|
||||||
%patch45 -p1
|
%patch -P 45 -p1
|
||||||
%patch46 -p1
|
%patch -P 46 -p1
|
||||||
%patch47 -p1
|
%patch -P 47 -p1
|
||||||
%patch48 -p1
|
%patch -P 48 -p1
|
||||||
%patch49 -p1
|
%patch -P 49 -p1
|
||||||
%patch50 -p1
|
%patch -P 50 -p1
|
||||||
%patch51 -p1
|
%patch -P 51 -p1
|
||||||
git apply %{PATCH52}
|
git apply %{PATCH52}
|
||||||
%patch53 -p1
|
%patch -P 53 -p1
|
||||||
%patch54 -p1
|
%patch -P 54 -p1
|
||||||
%patch55 -p1
|
%patch -P 55 -p1
|
||||||
%patch56 -p1
|
%patch -P 56 -p1
|
||||||
%patch57 -p1
|
%patch -P 57 -p1
|
||||||
%patch58 -p1
|
%patch -P 58 -p1
|
||||||
%patch59 -p1
|
%patch -P 59 -p1
|
||||||
%patch60 -p1
|
%patch -P 60 -p1
|
||||||
%patch61 -p1
|
%patch -P 61 -p1
|
||||||
%patch62 -p1
|
%patch -P 62 -p1
|
||||||
%patch63 -p1
|
%patch -P 63 -p1
|
||||||
|
|
||||||
# make tests/*.py use Python 3
|
# make tests/*.py use Python 3
|
||||||
sed -e '1 s|^#!/.*python|#!%{__python3}|' -i tests/*.py
|
sed -e '1 s|^#!/.*python|#!%{__python3}|' -i tests/*.py
|
||||||
|
Loading…
Reference in New Issue
Block a user