Bläddra i källkod

curl-7.50.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10740 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 8 år sedan
förälder
incheckning
e424c54e71
1 ändrade filer med 18 tillägg och 4 borttagningar
  1. 18 4
      c/curl/curl-vl.spec

+ 18 - 4
c/curl/curl-vl.spec

@@ -1,10 +1,14 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
+%if %{?_dist_release} != "vl6"
+%global with_http2 1
+%endif
+
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
-Version: 7.49.1
-Release: 2%{?_dist_release}
+Version: 7.50.0
+Release: 1%{?_dist_release}
 
 License: MIT
 Group: Applications/Internet
@@ -21,7 +25,6 @@ Patch104: 0104-curl-7.19.7-localhost6.patch
 Patch107: 0107-curl-7.21.4-libidn-valgrind.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libnghttp2-devel
 BuildRequires: openssl-devel libidn-devel zlib-devel
 BuildRequires: openldap-devel gnutls-devel
 BuildRequires: openssh-server
@@ -30,6 +33,10 @@ BuildRequires: pkgconfig
 %if "%{?_dist_release}" != "vl6"
 BuildRequires: libssh2-devel
 %endif
+%if 0%{?with_http2}
+BuildRequires: libnghttp2-devel
+%endif
+
 Requires: ca-certificates
 
 Vendor: Project Vine
@@ -95,12 +102,14 @@ use cURL's capabilities internally.
   --with-ssl=%{_prefix} \
   --with-gnutls \
   --with-libidn \
-  --with-nghttp2 \
   --enable-ipv6 \
   --enable-threaded-resolver \
   --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 %if "%{?_dist_release}" != "vl6"
   --with-libssh2 \
+%endif
+%if 0%{?with_http2}
+  --with-nghttp2 \
 %endif
   --enable-ldaps \
   --disable-static \
@@ -123,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc CHANGES README
 %doc docs/BUGS docs/CONTRIBUTE docs/examples docs/FAQ docs/FEATURES
@@ -157,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Jul 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.50.0-1
+- new upstream release.
+- disabled HTTP/2 on Vine6.
+
 * Sat Jul 16 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.49.1-2
 - added HTTP/2 support.