X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=curl.spec;h=7f358be5887d93ee4081daab412962789b9f4e35;hb=6c93c04;hp=df4e656169b622e7e94ef4c840cff1eef7d02183;hpb=838a6edad63745be45ac24135b9a8c45b921ba6a;p=packages%2Fcurl.git

diff --git a/curl.spec b/curl.spec
index df4e656..7f358be 100644
--- 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.42.1
+Version:	7.52.1
 Release:	1
 License:	MIT-like
 Group:		Applications/Networking
-Source0:	http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5:	f1e460020a99da039b153e4bf0cd8600
+Source0:	https://curl.haxx.se/download/%{name}-%{version}.tar.lzma
+# Source0-md5:	ddbd157359bc8a9174e11b151254b264
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-krb5flags.patch
 URL:		http://curl.haxx.se/
@@ -35,13 +35,14 @@ BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 %{?with_ares:BuildRequires:	c-ares-devel >= 1.7.0}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
-BuildRequires:	libidn-devel >= 0.4.1
-%{?with_metalink:BuildRequires:	libmetalink-devel}
+BuildRequires:	libidn2-devel
+%{?with_metalink:BuildRequires:	libmetalink-devel >= 0.1.0}
+BuildRequires:	libpsl-devel
 %{?with_rtmp:BuildRequires:	librtmp-devel}
 %{?with_ssh:BuildRequires:	libssh2-devel >= 1.2.8}
 BuildRequires:	libtool
 BuildRequires:	nettle-devel
-%{?with_http2:BuildRequires:	nghttp2-devel >= 0.6}
+%{?with_http2:BuildRequires:	nghttp2-devel >= 1.9.0}
 %{?with_ldap:BuildRequires:	openldap-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	rpm >= 4.4.9-56
@@ -56,7 +57,6 @@ BuildRequires:	openssl-devel >= 1.0.1
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	libidn >= 0.4.1
 Obsoletes:	libcurl2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -115,12 +115,13 @@ Summary(pl.UTF-8):	Biblioteka curl
 Group:		Libraries
 %{?with_ares:Requires:	c-ares >= 1.7.0}
 %{?with_ssh:Requires:	libssh2 >= 1.2.8}
-%{?with_http2:Requires:	nghttp2 >= 0.6}
+%{?with_http2:Requires:	nghttp2-libs >= 1.9.0}
 %if %{with ssl} && %{without gnutls}
 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.
@@ -138,10 +139,11 @@ Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 %{?with_ares:Requires:	c-ares-devel}
 %{?with_kerberos5:Requires:	heimdal-devel}
-Requires:	libidn-devel >= 0.4.1
+Requires:	libidn2-devel
+Requires:	libpsl-devel
 %{?with_rtmp:Requires:	librtmp-devel}
 %{?with_ssh:Requires:	libssh2-devel >= 1.2.8}
-%{?with_http2:Requires:	nghttp2-devel >= 0.6}
+%{?with_http2:Requires:	nghttp2-devel >= 1.9.0}
 %{?with_ldap:Requires:	openldap-devel}
 %if %{with ssl}
 %if %{with gnutls}
@@ -196,6 +198,19 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 Цей пакет містить статичну бібліотеку для розробки програм з
 використанням бібліотеки curl.
 
+%package -n zsh-completion-curl
+Summary:	ZSH completion for curl command
+Summary(pl.UTF-8):	Dopełnianianie parametrów w ZSH dla polecenia curl
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	zsh
+
+%description -n zsh-completion-curl
+ZSH completion for curl command.
+
+%description -n zsh-completion-curl -l pl.UTF-8
+Dopełnianianie parametrów w ZSH dla polecenia curl.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -211,6 +226,11 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %{__automake}
 %configure \
 	ac_cv_header_gss_h=no \
+	%{__enable_disable ares} \
+	--enable-ipv6 \
+	%{__enable_disable ldap} \
+	%{__enable_disable ldap ldaps} \
+	--disable-silent-rules \
 %if %{with ssl}
 	--with-ca-bundle=/etc/certs/ca-certificates.crt \
 %if %{with gnutls}
@@ -223,11 +243,7 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 	%{__with_without metalink libmetalink} \
 	%{__with_without rtmp librtmp} \
 	%{__with_without http2 nghttp2} \
-	%{__enable_disable ares} \
-	%{__with_without ssh ssh2} \
-	--enable-ipv6 \
-	%{__enable_disable ldap} \
-	%{__enable_disable ldap ldaps}
+	%{__with_without ssh libssh2}
 
 %{__make}
 
@@ -236,6 +252,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__make} -C scripts install \
+	DESTDIR=$RPM_BUILD_ROOT
+
 # no longer in upstream but a lot of apps tries to include it so we create fake one
 [ -e $RPM_BUILD_ROOT%{_includedir}/curl/types.h ] && exit 1
 echo '#warning curl/types.h IS OBSOLETE FROM 2004. STOP USING IT' > $RPM_BUILD_ROOT%{_includedir}/curl/types.h
@@ -248,7 +267,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES COPYING README docs/{BUGS,FAQ,FEATURES,HISTORY,KNOWN_BUGS,MANUAL,SSLCERTS,THANKS,TODO,TheArtOfHttpScripting}
+%doc CHANGES COPYING README docs/{BUGS,FAQ,FEATURES,HISTORY.md,KNOWN_BUGS,MANUAL,SSLCERTS.md,THANKS,TODO,TheArtOfHttpScripting}
 %attr(755,root,root) %{_bindir}/curl
 %{_mandir}/man1/curl.1*
 
@@ -259,7 +278,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/{CONTRIBUTE,INTERNALS,LICENSE-MIXING,RESOURCES}
+%doc docs/{CONTRIBUTE.md,INTERNALS.md,LICENSE-MIXING.md,RESOURCES}
 %attr(755,root,root) %{_bindir}/curl-config
 %attr(755,root,root) %{_libdir}/libcurl.so
 %{_libdir}/libcurl.la
@@ -269,9 +288,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/curl-config.1*
 %{_mandir}/man3/curl_*.3*
 %{_mandir}/man3/libcurl*.3*
+%{_mandir}/man3/CURLINFO_*.3*
 %{_mandir}/man3/CURLOPT_*.3*
 %{_mandir}/man3/CURLMOPT_*.3*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcurl.a
+
+%files -n zsh-completion-curl
+%defattr(644,root,root,755)
+%{_datadir}/zsh/site-functions/_curl