diff --git a/curl-7.81.0.tar.xz b/curl-7.81.0.tar.xz deleted file mode 100644 index 6f4ba85e35f1ece27fe8d9c18bc19daafd830332..0000000000000000000000000000000000000000 Binary files a/curl-7.81.0.tar.xz and /dev/null differ diff --git a/curl-7.84.0.tar.xz b/curl-7.84.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..6e1c9ff3e2fde5fb6f3d486d268c02afe40d1c9a Binary files /dev/null and b/curl-7.84.0.tar.xz differ diff --git a/curl.spec b/curl.spec index 84af8665c7654718f028097d1cb62e99fa178368..f15d4906900a2bb975b2d232eed419bb25a8f510 100644 --- a/curl.spec +++ b/curl.spec @@ -1,7 +1,7 @@ %define anolis_release 1 Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.81.0 +Version: 7.84.0 Release: %{anolis_release}%{?dist} License: MIT Source0: https://curl.se/download/%{name}-%{version}.tar.xz @@ -78,7 +78,7 @@ BuildRequires: valgrind %endif # using an older version of libcurl could result in CURLE_UNKNOWN_OPTION -Requires: libcurl%{?_isa} >= %{version}-%{release} +Requires: libcurl >= %{version}-%{release} # require at least the version of libpsl that we were built against, # to ensure that we have the necessary symbols available (#1631804) @@ -103,11 +103,10 @@ resume, proxy tunneling and a busload of other useful tricks. %package -n libcurl Summary: A library for getting files from web servers -Requires: libpsl%{?_isa} >= %{libpsl_version} -Requires: libssh%{?_isa} >= %{libssh_version} -Requires: openssl-libs%{?_isa} >= 1:%{openssl_version} +Requires: libpsl >= %{libpsl_version} +Requires: libssh >= %{libssh_version} +Requires: openssl-libs >= 1:%{openssl_version} Provides: libcurl-full = %{version}-%{release} -Provides: libcurl-full%{?_isa} = %{version}-%{release} %description -n libcurl libcurl is a free and easy-to-use client-side URL transfer library, supporting @@ -119,10 +118,9 @@ resume, http proxy tunneling and more. %package -n libcurl-devel Summary: Files needed for building applications with libcurl -Requires: libcurl%{?_isa} = %{version}-%{release} +Requires: libcurl = %{version}-%{release} Provides: curl-devel = %{version}-%{release} -Provides: curl-devel%{?_isa} = %{version}-%{release} Obsoletes: curl-devel < %{version}-%{release} %description -n libcurl-devel @@ -137,7 +135,7 @@ Conflicts: curl RemovePathPostfixes: .minimal # using an older version of libcurl could result in CURLE_UNKNOWN_OPTION -Requires: libcurl%{?_isa} >= %{version}-%{release} +Requires: libcurl >= %{version}-%{release} %description -n curl-minimal This is a replacement of the 'curl' package for minimal installations. It @@ -147,10 +145,9 @@ be installed. %package -n libcurl-minimal Summary: Conservatively configured build of libcurl for minimal installations -Requires: openssl-libs%{?_isa} >= 1:%{openssl_version} +Requires: openssl-libs >= 1:%{openssl_version} Provides: libcurl = %{version}-%{release} -Provides: libcurl%{?_isa} = %{version}-%{release} -Conflicts: libcurl%{?_isa} +Conflicts: libcurl RemovePathPostfixes: .minimal # needed for RemovePathPostfixes to work with shared libraries %undefine __brp_ldconfig @@ -161,6 +158,14 @@ comes with a limited set of features compared to the 'libcurl' package. On the other hand, the package is smaller and requires fewer run-time dependencies to be installed. +%package doc +Summary: Doc files for curl +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +Doc files for curl + %prep %setup -q @@ -332,13 +337,6 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %ldconfig_scriptlets -n libcurl-minimal %files -%doc CHANGES -%doc README -%doc docs/BUGS.md -%doc docs/FAQ -%doc docs/FEATURES.md -%doc docs/TODO -%doc docs/TheArtOfHttpScripting.md %{_bindir}/curl %{_mandir}/man1/curl.1* %{_datadir}/zsh @@ -368,7 +366,18 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_libdir}/libcurl.so.4.minimal %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal +%files doc +%doc CHANGES +%doc README +%doc docs/BUGS.md +%doc docs/FAQ +%doc docs/FEATURES.md +%doc docs/TODO +%doc docs/TheArtOfHttpScripting.md + %changelog +* Mon Aug 29 2022 Chunmei Xu - 7.84.0-1 +- update to 7.84.0 + * Tue Mar 8 2022 Liwei Ge - 7.81.0-1 - Init version from upstream v7.81.0 -