From 90885b80c20af9c6cf294f524fb7af3002fc4954 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Feb 19 2016 12:53:16 +0000 Subject: Bump to upstream 04b9de9b512f58addf28c9853d50ebef61c3953e - related: #1230677 --- diff --git a/.gitignore b/.gitignore index 6abf7a9..6f90d51 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/net-1bc0720.tar.gz +/net-04b9de9.tar.gz diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec index 724e63f..44b4ea9 100644 --- a/golang-googlecode-net.spec +++ b/golang-googlecode-net.spec @@ -25,7 +25,7 @@ # https://github.com/golang/net %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path code.google.com/p/go.net -%global commit 1bc0720082d79ce7ffc6ef6e523d00d46b0dee45 +%global commit 04b9de9b512f58addf28c9853d50ebef61c3953e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global x_provider golang @@ -39,7 +39,7 @@ Name: golang-googlecode-net Version: 0 -Release: 0.28.git%{shortcommit}%{?dist} +Release: 0.29.git%{shortcommit}%{?dist} Summary: Supplementary Go networking libraries License: BSD URL: https://%{provider_prefix} @@ -61,21 +61,13 @@ BuildArch: noarch %if 0%{?with_check} BuildRequires: golang(code.google.com/p/go.text/encoding) BuildRequires: golang(code.google.com/p/go.text/encoding/charmap) -BuildRequires: golang(code.google.com/p/go.text/encoding/japanese) -BuildRequires: golang(code.google.com/p/go.text/encoding/korean) -BuildRequires: golang(code.google.com/p/go.text/encoding/simplifiedchinese) -BuildRequires: golang(code.google.com/p/go.text/encoding/traditionalchinese) -BuildRequires: golang(code.google.com/p/go.text/encoding/unicode) +BuildRequires: golang(code.google.com/p/go.text/encoding/htmlindex) BuildRequires: golang(code.google.com/p/go.text/transform) %endif Requires: golang(code.google.com/p/go.text/encoding) Requires: golang(code.google.com/p/go.text/encoding/charmap) -Requires: golang(code.google.com/p/go.text/encoding/japanese) -Requires: golang(code.google.com/p/go.text/encoding/korean) -Requires: golang(code.google.com/p/go.text/encoding/simplifiedchinese) -Requires: golang(code.google.com/p/go.text/encoding/traditionalchinese) -Requires: golang(code.google.com/p/go.text/encoding/unicode) +Requires: golang(code.google.com/p/go.text/encoding/htmlindex) Requires: golang(code.google.com/p/go.text/transform) Provides: golang(%{import_path}/context) = %{version}-%{release} @@ -84,6 +76,8 @@ Provides: golang(%{import_path}/dict) = %{version}-%{release} Provides: golang(%{import_path}/html) = %{version}-%{release} Provides: golang(%{import_path}/html/atom) = %{version}-%{release} Provides: golang(%{import_path}/html/charset) = %{version}-%{release} +Provides: golang(%{import_path}/http2) = %{version}-%{release} +Provides: golang(%{import_path}/http2/hpack) = %{version}-%{release} Provides: golang(%{import_path}/icmp) = %{version}-%{release} Provides: golang(%{import_path}/idna) = %{version}-%{release} Provides: golang(%{import_path}/ipv4) = %{version}-%{release} @@ -94,6 +88,7 @@ Provides: golang(%{import_path}/publicsuffix) = %{version}-%{release} Provides: golang(%{import_path}/trace) = %{version}-%{release} Provides: golang(%{import_path}/webdav) = %{version}-%{release} Provides: golang(%{import_path}/websocket) = %{version}-%{release} +Provides: golang(%{import_path}/xsrftoken) = %{version}-%{release} %package -n %{x_name}-devel Summary: Supplementary Go networking libraries for golang.org/x/ imports @@ -102,21 +97,13 @@ BuildArch: noarch %if 0%{?with_unit_test} BuildRequires: golang(golang.org/x/text/encoding) BuildRequires: golang(golang.org/x/text/encoding/charmap) -BuildRequires: golang(golang.org/x/text/encoding/japanese) -BuildRequires: golang(golang.org/x/text/encoding/korean) -BuildRequires: golang(golang.org/x/text/encoding/simplifiedchinese) -BuildRequires: golang(golang.org/x/text/encoding/traditionalchinese) -BuildRequires: golang(golang.org/x/text/encoding/unicode) +BuildRequires: golang(golang.org/x/text/encoding/htmlindex) BuildRequires: golang(golang.org/x/text/transform) %endif Requires: golang(golang.org/x/text/encoding) Requires: golang(golang.org/x/text/encoding/charmap) -Requires: golang(golang.org/x/text/encoding/japanese) -Requires: golang(golang.org/x/text/encoding/korean) -Requires: golang(golang.org/x/text/encoding/simplifiedchinese) -Requires: golang(golang.org/x/text/encoding/traditionalchinese) -Requires: golang(golang.org/x/text/encoding/unicode) +Requires: golang(golang.org/x/text/encoding/htmlindex) Requires: golang(golang.org/x/text/transform) Provides: golang(%{x_import_path}/context) = %{version}-%{release} @@ -125,6 +112,8 @@ Provides: golang(%{x_import_path}/dict) = %{version}-%{release} Provides: golang(%{x_import_path}/html) = %{version}-%{release} Provides: golang(%{x_import_path}/html/atom) = %{version}-%{release} Provides: golang(%{x_import_path}/html/charset) = %{version}-%{release} +Provides: golang(%{x_import_path}/http2) = %{version}-%{release} +Provides: golang(%{x_import_path}/http2/hpack) = %{version}-%{release} Provides: golang(%{x_import_path}/icmp) = %{version}-%{release} Provides: golang(%{x_import_path}/idna) = %{version}-%{release} Provides: golang(%{x_import_path}/ipv4) = %{version}-%{release} @@ -135,6 +124,7 @@ Provides: golang(%{x_import_path}/publicsuffix) = %{version}-%{release} Provides: golang(%{x_import_path}/trace) = %{version}-%{release} Provides: golang(%{x_import_path}/webdav) = %{version}-%{release} Provides: golang(%{x_import_path}/websocket) = %{version}-%{release} +Provides: golang(%{x_import_path}/xsrftoken) = %{version}-%{release} %description devel %{summary} @@ -215,35 +205,34 @@ done %check %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%ifarch 0%{?gccgo_arches} -function gotest { %{gcc_go_test} "$@"; } +%if ! 0%{?with_bundled} +export GOPATH=%{buildroot}/%{gopath}:%{gopath} %else -%if 0%{?golang_test:1} -function gotest { %{golang_test} "$@"; } -%else -function gotest { go test "$@"; } +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif + +%if ! 0%{?gotest:1} +%global gotest go test %endif -export GOPATH=%{buildroot}%{gopath}:%{gopath} -go test %{x_import_path}/context -go test %{x_import_path}/context/ctxhttp -go test %{x_import_path}/html -go test %{x_import_path}/html/atom -go test %{x_import_path}/html/charset +%gotest %{x_import_path}/context +%gotest %{x_import_path}/context/ctxhttp +%gotest %{x_import_path}/html +%gotest %{x_import_path}/html/atom +%gotest %{x_import_path}/html/charset # socket: permission denied -#go test %%{x_import_path}/icmp -go test %{x_import_path}/idna -go test %{x_import_path}/internal/timeseries -go test %{x_import_path}/ipv4 -go test %{x_import_path}/ipv6 -go test %{x_import_path}/netutil -go test %{x_import_path}/proxy -go test %{x_import_path}/publicsuffix -go test %{x_import_path}/trace -go test %{x_import_path}/webdav -go test %{x_import_path}/webdav/internal/xml -go test %{x_import_path}/websocket +#%%gotest %%{x_import_path}/icmp +%gotest %{x_import_path}/idna +%gotest %{x_import_path}/internal/timeseries +%gotest %{x_import_path}/ipv4 +%gotest %{x_import_path}/ipv6 +%gotest %{x_import_path}/netutil +%gotest %{x_import_path}/proxy +%gotest %{x_import_path}/publicsuffix +%gotest %{x_import_path}/trace +%gotest %{x_import_path}/webdav +%gotest %{x_import_path}/webdav/internal/xml +%gotest %{x_import_path}/websocket %endif #define license tag if not already defined @@ -268,6 +257,10 @@ go test %{x_import_path}/websocket %endif %changelog +* Fri Feb 19 2016 jchaloup - 0-0.29.git04b9de9 +- Bump to upstream 04b9de9b512f58addf28c9853d50ebef61c3953e + related: #1230677 + * Wed Feb 03 2016 Fedora Release Engineering - 0-0.28.git1bc0720 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index a300718..0cb4589 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce751c45d0bd626b0c45a1a6c44374ab net-1bc0720.tar.gz +48568d3fe9dabb3e168e6cabc06d0569 net-04b9de9.tar.gz