X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=curl.spec;h=f0e451db0a6f2ec05c6ed69241eaedc81ae33340;hb=6923614e3c519d1648bb8a38459dc85effa95c7f;hp=cacc10b310d826c5f4068d269b105b916d588b91;hpb=1edc8a39e827e7d3c634ffeb2cb0a7736c4ac26e;p=packages%2Fcurl.git diff --git a/curl.spec b/curl.spec index cacc10b..f0e451d 100644 --- a/curl.spec +++ b/curl.spec @@ -1,12 +1,19 @@ # # Conditional build: -%bcond_without ares # with c-ares (asynchronous DNS operations) library -%bcond_without ssh # without SSH support -%bcond_without ssl # without SSL support -%bcond_without gnutls # use GnuTLS instead of OpenSSL -%bcond_without kerberos5 # without Heimdal Kerberos 5 support -%bcond_without rtmp # without Real Time Media Protocol -%bcond_without ldap # without LDAP support +%bcond_without ssh # SSH support +%bcond_without ssl # SSL support +%bcond_with gnutls # GnuTLS instead of OpenSSL +%bcond_without kerberos5 # Heimdal Kerberos 5 support +%bcond_without ldap # LDAP support +%bcond_without http2 # HTTP/2.0 support (nghttp2 based) +%bcond_without metalink # metalink support +%if "%{pld_release}" != "ac" +%bcond_without ares # c-ares (asynchronous DNS operations) library support +%bcond_without rtmp # Real Time Media Protocol support +%else +%bcond_with ares # c-ares (asynchronous DNS operations) library support +%bcond_with rtmp # Real Time Media Protocol support +%endif Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary(es.UTF-8): Un cliente para bajar archivos de servidores (FTP, HTTP, y otros) @@ -15,41 +22,42 @@ 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.21.7 -Release: 4 +Version: 7.64.0 +Release: 1 License: MIT-like Group: Applications/Networking -Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma -# Source0-md5: 5dbcbabe8fd577763106c4f655e31b66 -Patch0: %{name}-no_strip.patch -Patch1: %{name}-ac.patch -Patch2: %{name}-pc.patch -Patch3: %{name}-krb5flags.patch -Patch4: libcurl.fb-changes.diff +Source0: https://curl.haxx.se/download/%{name}-%{version}.tar.xz +# Source0-md5: d14fe778e9f00399445d9525117e25a3 +Patch0: %{name}-ac.patch +Patch1: %{name}-krb5flags.patch URL: http://curl.haxx.se/ 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 +BuildRequires: libbrotli-devel >= 1.0.0 +BuildRequires: libidn2-devel +%{?with_metalink:BuildRequires: libmetalink-devel >= 0.1.0} +BuildRequires: libpsl-devel %{?with_rtmp:BuildRequires: librtmp-devel} -%{?with_ssh:BuildRequires: libssh2-devel >= 0.16} +%{?with_ssh:BuildRequires: libssh2-devel >= 1.2.8} BuildRequires: libtool +BuildRequires: nettle-devel +%{?with_http2:BuildRequires: nghttp2-devel >= 1.9.0} %{?with_ldap:BuildRequires: openldap-devel} BuildRequires: pkgconfig +BuildRequires: rpm >= 4.4.9-56 +BuildRequires: rpmbuild(macros) >= 1.527 %if %{with ssl} %if %{with gnutls} BuildRequires: gnutls-devel %else -BuildRequires: openssl-devel >= 0.9.7d +BuildRequires: openssl-devel >= 1.0.1 %endif %endif BuildRequires: tar >= 1:1.22 BuildRequires: zlib-devel Requires: %{name}-libs = %{version}-%{release} -Requires: libidn >= 0.4.1 -%{?with_ssh:Requires: libssh2 >= 0.16} -Requires: openssl-tools >= 0.9.7d Obsoletes: libcurl2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -106,9 +114,14 @@ curl п╕дтриму╓ багато корисних можливостей, Summary: curl library 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-libs >= 1.9.0} +%if %{with ssl} && %{without gnutls} +Requires: openssl >= 1.0.1 +%endif Suggests: ca-certificates Conflicts: ca-certificates < 20080809-4 -%{?with_ares:Requires: c-ares >= 1.7.0} %description libs curl library. @@ -126,9 +139,12 @@ 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: libbrotli-devel >= 1.0.0 +Requires: libidn2-devel +Requires: libpsl-devel %{?with_rtmp:Requires: librtmp-devel} -%{?with_ssh:Requires: libssh2-devel >= 0.16} +%{?with_ssh:Requires: libssh2-devel >= 1.2.8} +%{?with_http2:Requires: nghttp2-devel >= 1.9.0} %{?with_ldap:Requires: openldap-devel} %if %{with ssl} %if %{with gnutls} @@ -183,13 +199,25 @@ 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 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 + +%{__rm} m4/lt*.m4 m4/libtool.m4 %build %{__libtoolize} @@ -199,6 +227,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} @@ -206,22 +239,25 @@ Bibliotecas estáticas para desenvolvimento com o curl. %else --with-ssl=%{_prefix} \ %endif +%else + --without-ssl --without-gnutls \ %endif - %{?with_kerberos5:--with-gssapi=%{_prefix}} \ - %{?with_rtmp:--with-librtmp} \ - %{?with_ares:--enable-ares} \ - %{?with_ldap:--enable-ldaps} \ - %{!?with_ldap:--disable-ldap} \ - --enable-ipv6 + %{__with_without kerberos5 gssapi %{_prefix}} \ + %{__with_without metalink libmetalink} \ + %{__with_without rtmp librtmp} \ + %{__with_without http2 nghttp2} \ + %{__with_without ssh libssh2} %{__make} %install 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 @@ -234,7 +270,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* @@ -245,16 +281,24 @@ 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 %{_includedir}/curl %{_pkgconfigdir}/libcurl.pc +%{_aclocaldir}/libcurl.m4 %{_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