From 76d8b9172fdf9d5d45199d162963968a4e80a7c4 Mon Sep 17 00:00:00 2001 From: yAn1hCDc Date: Mon, 24 Jun 2024 03:29:43 +0000 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dlibcurl=E5=92=8Cli?= =?UTF-8?q?bcurl-devel=E5=90=8C=E6=97=B6=E5=AE=89=E8=A3=85=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20Solution:=20add=20epoch=20macro=20in=20Pro?= =?UTF-8?q?vides=20and=20Requires.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yAn1hCDc --- curl.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/curl.spec b/curl.spec index 7a4c7d6..77fa6e4 100644 --- a/curl.spec +++ b/curl.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Epoch: 1 @@ -9,7 +9,7 @@ Source0: https://curl.se/download/%{name}-%{version}.tar.xz # Upstream patch -Provides: curl-full = %{version}-%{release} +Provides: curl-full = %{epoch}:%{version}-%{release} Provides: webclient URL: https://curl.se/ BuildRequires: automake @@ -103,7 +103,7 @@ Summary: A library for getting files from web servers Requires: libpsl >= %{installed_version_of libpsl} Requires: libssh >= %{installed_version_of libssh} Requires: openssl-libs >= %{installed_version_of openssl-libs} -Provides: libcurl-full = %{version}-%{release} +Provides: libcurl-full = %{epoch}:%{version}-%{release} Requires: libnghttp2 >= %{installed_version_of libnghttp2} %description -n libcurl @@ -116,9 +116,9 @@ resume, http proxy tunneling and more. %package -n libcurl-devel Summary: Files needed for building applications with libcurl -Requires: libcurl = %{version}-%{release} +Requires: libcurl = %{epoch}:%{version}-%{release} -Provides: curl-devel = %{version}-%{release} +Provides: curl-devel = %{epoch}:%{version}-%{release} Obsoletes: curl-devel < %{version}-%{release} %description -n libcurl-devel @@ -128,7 +128,7 @@ documentation of the library, too. %package -n curl-minimal Summary: Conservatively configured build of curl for minimal installations -Provides: curl = %{version}-%{release} +Provides: curl = %{epoch}:%{version}-%{release} Conflicts: curl RemovePathPostfixes: .minimal @@ -144,7 +144,7 @@ be installed. %package -n libcurl-minimal Summary: Conservatively configured build of libcurl for minimal installations Requires: openssl-libs >= %{installed_version_of openssl-libs} -Provides: libcurl = %{version}-%{release} +Provides: libcurl = %{epoch}:%{version}-%{release} Conflicts: libcurl RemovePathPostfixes: .minimal # needed for RemovePathPostfixes to work with shared libraries @@ -158,7 +158,7 @@ be installed. %package doc Summary: Doc files for curl -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} BuildArch: noarch %description doc @@ -367,6 +367,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/fish %doc docs/TheArtOfHttpScripting.md %changelog +* Mon Jun 24 2024 yanyihao - 8.4.0-4 +- fix conflict when both install libcurl and libcurl-devel + * Tue May 14 2024 yangxinyu - 8.4.0-3 - fix cve-2024-2398 -- Gitee