From d0f424567bb11d16e64b9e5560cfabefa55cc2c6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 09 2020 16:09:00 +0000
Subject: import curl-7.61.1-16.el8


---

diff --git a/SPECS/curl.spec b/SPECS/curl.spec
index f136a0a..d32e5ed 100644
--- a/SPECS/curl.spec
+++ b/SPECS/curl.spec
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.61.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: MIT
 Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
@@ -207,7 +207,7 @@ Summary: Conservatively configured build of libcurl for minimal installations
 Requires: openssl-libs%{?_isa} >= 1:%{openssl_version}
 Provides: libcurl = %{version}-%{release}
 Provides: libcurl%{?_isa} = %{version}-%{release}
-Conflicts: libcurl
+Conflicts: libcurl%{?_isa}
 RemovePathPostfixes: .minimal
 # needed for RemovePathPostfixes to work with shared libraries
 %undefine __brp_ldconfig
@@ -410,6 +410,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
 
 %changelog
+* Fri Nov 06 2020 Kamil Dudka <kdudka@redhat.com> - 7.61.1-16
+- fix multiarch conflicts in libcurl-minimal (#1895391)
+
 * Tue Nov 03 2020 Kamil Dudka <kdudka@redhat.com> - 7.61.1-15
 - do not crash when HTTPS_PROXY and NO_PROXY are used together (#1873327)
 - libcurl: wrong connect-only connection (CVE-2020-8231)