drop mysql-libs conflict; not relevant anymore and prevents using older mysql versions

[packages/curl.git] / curl.spec

diff --git a/curl.spec b/curl.spec
index f3969d2b2434f2e129042f70e7cd52fd00d94862..efa2964e708c359837c40f834ea303df737972d6 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -22,12 +22,12 @@ Summary(pt_BR.UTF-8):       Busca URL (suporta FTP, TELNET, LDAP, GOPHER, DICT, HTTP e
 Summary(ru.UTF-8):     Утилита для получения файлов с серверов FTP, HTTP и других
 Summary(uk.UTF-8):     Утиліта для отримання файлів з серверів FTP, HTTP та інших
 Name:          curl
-Version:       7.51.0
-Release:       1
+Version:       7.60.0
+Release:       2
 License:       MIT-like
 Group:         Applications/Networking
-Source0:       https://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: 0f876ef6d5776d96b08510461d57db1b
+Source0:       https://curl.haxx.se/download/%{name}-%{version}.tar.xz
+# Source0-md5: a889cd11b4ae8794b7030472cb4df0a0
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-krb5flags.patch
 URL:           http://curl.haxx.se/
@@ -35,6 +35,7 @@ BuildRequires:        autoconf >= 2.57
 BuildRequires: automake
 %{?with_ares:BuildRequires:    c-ares-devel >= 1.7.0}
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
+BuildRequires: libbrotli-devel >= 1.0.0
 BuildRequires: libidn2-devel
 %{?with_metalink:BuildRequires:        libmetalink-devel >= 0.1.0}
 BuildRequires: libpsl-devel
@@ -121,7 +122,6 @@ Requires:   openssl >= 1.0.1
 %endif
 Suggests:      ca-certificates
 Conflicts:     ca-certificates < 20080809-4
-Conflicts:     mysql-libs < 5.6.30-76.3.3
 
 %description libs
 curl library.
@@ -139,6 +139,7 @@ Group:              Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 %{?with_ares:Requires: c-ares-devel}
 %{?with_kerberos5:Requires:    heimdal-devel}
+Requires:      libbrotli-devel >= 1.0.0
 Requires:      libidn2-devel
 Requires:      libpsl-devel
 %{?with_rtmp:Requires: librtmp-devel}