redadmin/pcs
1
0
Fork 0
forked from rpms/pcs
Code Pull Requests Activity

update pycurl

Browse Source 
I forgot to update pycurl since we didn't use to bundle it. Also, python
maintainers updated the version detection logic to let pycurl also work
with RC versions of libcurl which I copied [1]. I went with Miro's
suggestion of putting the tilde in the Requires to have the sed more
readable.

[1]: https://src.fedoraproject.org/rpms/python-pycurl/pull-request/11
This commit is contained in:
Michal Pospíšil 2025-07-08 19:07:10 +02:00
parent e98ef3d2f1
commit a338e92793
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcs.spec
View File

@ -48,13 +48,14 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64 riscv64
%global dacite_version 1.9.2
%global pyagentx_version 0.4.pcs.2
%global pycurl_version 7.45.3
%global pycurl_version 7.45.6
# During its initialization, PycURL checks that the actual libcurl version
# is not lower than the one used when PycURL was built.
# Yes, that should be handled by library versioning (which would then get
# automatically reflected by rpm).
# For now, we have to reflect that dependency.
%global libcurl_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;q'
# Remove RC version suffixes, see: https://src.fedoraproject.org/rpms/python-pycurl/pull-request/11
%global libcurl_sed '/^#define LIBCURL_VERSION "/!d;s/"[^"]*$//;s/.*"//;s/-.*$//;q'
%global curlver_h /usr/include/curl/curlver.h
%global libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
@ -209,8 +210,9 @@ Requires: ruby >= 3.3.0
Requires: rubygems
Requires: rubygem-json
Requires: rubygem-rexml
# for pycurl
Requires: libcurl%{?_isa} >= %{libcurl_ver}
# for pycurl - the tilde fixes issue with RC version sorting, see macro
# definition above
Requires: libcurl%{?_isa} >= %{libcurl_ver}~
# for killall
Requires: psmisc
# cluster stack and related packages