From 2d6d1930b41044a94f15eca570576fdc9f56c87b Mon Sep 17 00:00:00 2001
From: Jinoh Kang <aurhb20@protonmail.ch>
Date: Sep 10 2020 08:25:47 +0000
Subject: Resolves: #1877671O - fix multiarch conflicts in libcurl-minimal


---

diff --git a/curl.spec b/curl.spec
index c9ba6b1..d56265a 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.69.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
@@ -168,7 +168,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
@@ -362,6 +362,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
 
 %changelog
+* Thu Sep 10 2020 Jinoh Kang <aurhb20@protonmail.ch> - 7.69.1-6
+- fix multiarch conflicts in libcurl-minimal (#1877671O)
+
 * Wed Aug 19 2020 Kamil Dudka <kdudka@redhat.com> - 7.69.1-5
 - libcurl: wrong connect-only connection (CVE-2020-8231)