From b5ee3d9142485531830713a76f3916fde0964a51 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Jun 11 2015 11:13:59 +0000
Subject: Bump to 7dbad50ab5b31073856416cdcfeb2796d682f844

- resolves: #1230677

---

diff --git a/.gitignore b/.gitignore
index 1baa2da..aa7be8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/net-71586c3.tar.gz
+/net-7dbad50.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index d9ee035..58ac5c0 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -4,7 +4,7 @@
 %global project         golang
 %global repo            net
 %global import_path     code.google.com/p/go.net
-%global commit          71586c3cf98f806af322c5a361660eb046e00501
+%global commit          7dbad50ab5b31073856416cdcfeb2796d682f844
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global x_provider      golang
@@ -13,9 +13,12 @@
 %global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
 %global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
 
+%global devel_main      golang-golangorg-net-devel
+%global devel_prefix    x
+
 Name:       golang-googlecode-net
 Version:    0
-Release:    0.20.git%{shortcommit}%{?dist}
+Release:    0.21.git%{shortcommit}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -39,21 +42,31 @@ 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/transform)
-Requires:   golang >= 1.2.1-3
+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/transform)
 Summary:    Supplementary Go networking libraries for code.google.com/p/ imports
 Provides:   golang(%{import_path}/context) = %{version}-%{release}
 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}/icmp) = %{version}-%{release}
 Provides:   golang(%{import_path}/idna) = %{version}-%{release}
 Provides:   golang(%{import_path}/internal/iana) = %{version}-%{release}
-Provides:   golang(%{import_path}/internal/icmp) = %{version}-%{release}
+Provides:   golang(%{import_path}/internal/nettest) = %{version}-%{release}
 Provides:   golang(%{import_path}/ipv4) = %{version}-%{release}
 Provides:   golang(%{import_path}/ipv6) = %{version}-%{release}
+Provides:   golang(%{import_path}/netutil) = %{version}-%{release}
 Provides:   golang(%{import_path}/proxy) = %{version}-%{release}
 Provides:   golang(%{import_path}/publicsuffix) = %{version}-%{release}
 Provides:   golang(%{import_path}/spdy) = %{version}-%{release}
+Provides:   golang(%{import_path}/webdav) = %{version}-%{release}
 Provides:   golang(%{import_path}/websocket) = %{version}-%{release}
 
 %package -n %{x_name}-devel
@@ -66,21 +79,32 @@ 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/transform)
-Requires:   golang >= 1.2.1-3
+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/transform)
+
 Summary:    Supplementary Go networking libraries for golang.org/x/ imports
 Provides:   golang(%{x_import_path}/context) = %{version}-%{release}
 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}/icmp) = %{version}-%{release}
 Provides:   golang(%{x_import_path}/idna) = %{version}-%{release}
 Provides:   golang(%{x_import_path}/internal/iana) = %{version}-%{release}
-Provides:   golang(%{x_import_path}/internal/icmp) = %{version}-%{release}
+Provides:   golang(%{x_import_path}/internal/nettest) = %{version}-%{release}
 Provides:   golang(%{x_import_path}/ipv4) = %{version}-%{release}
 Provides:   golang(%{x_import_path}/ipv6) = %{version}-%{release}
+Provides:   golang(%{x_import_path}/netutil) = %{version}-%{release}
 Provides:   golang(%{x_import_path}/proxy) = %{version}-%{release}
 Provides:   golang(%{x_import_path}/publicsuffix) = %{version}-%{release}
 Provides:   golang(%{x_import_path}/spdy) = %{version}-%{release}
+Provides:   golang(%{x_import_path}/webdav) = %{version}-%{release}
 Provides:   golang(%{x_import_path}/websocket) = %{version}-%{release}
 
 %description devel
@@ -115,14 +139,18 @@ sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
 %check
 # context, icmp failing
 GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/spdy
-GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/webdav
+#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/webdav
 #GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ipv4
 GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html
-#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/charset
+%if 0%{?fedora} == 20 || 0%{?fedora} == 21
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/charset
+%endif
 GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/atom
 GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/idna
 GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/netutil
-#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ipv6
+%if 0%{?fedora} == 20 || 0%{?fedora} == 21
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ipv6
+%endif
 GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/websocket
 GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/publicsuffix
 GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/proxy
@@ -141,6 +169,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Thu Jun 11 2015 jchaloup <jchaloup@redhat.com> - 0-0.21.git7dbad50
+- Bump to 7dbad50ab5b31073856416cdcfeb2796d682f844
+  resolves: #1230677
+
 * Fri Feb 06 2015 jchaloup <jchaloup@redhat.com> - 0-0.20.git71586c3
 - Bump to upstream 71586c3cf98f806af322c5a361660eb046e00501
 - Repo moved to github, changing spec file header and globals
diff --git a/sources b/sources
index dd0a03e..cc9578a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ccc4eb5631b6e21a018691229f665838  net-71586c3.tar.gz
+6222294f35e04d521887070cdeb68f4b  net-7dbad50.tar.gz