jchaloup pushed to golang-googlecode-net (f21). "Merge branches 'f20', 'f21' and 'el6'"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Jun 11 12:34:57 UTC 2015


From 370b18e805c4aee8d74f4b48e3b262cc0f17db2c Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5 at redhat.com>
Date: Fri, 17 Jan 2014 15:18:52 -0500
Subject: exclusive arch for el6+, add check

Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>

diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index da5dafc..ef6af20 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -6,12 +6,12 @@
 
 Name:           golang-googlecode-net
 Version:        0
-Release:        0.12.hg%{shortrev}%{?dist}
+Release:        0.13.hg%{shortrev}%{?dist}
 Summary:        Supplementary Go networking libraries
 License:        BSD
 URL:            http://%{import_path}
 Source0:        https://net.go.googlecode.com/archive/%{rev}.zip
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 19
 BuildArch:      noarch
 %else
 ExclusiveArch:  %{ix86} x86_64 %{arm}
@@ -21,6 +21,7 @@ ExclusiveArch:  %{ix86} x86_64 %{arm}
 %{summary}
 
 %package devel
+BuildRequires:  golang
 Requires:       golang
 Summary:        Supplementary Go networking libraries
 Provides:       golang(%{import_path}) = %{version}-%{release}
@@ -55,6 +56,17 @@ for d in dict html idna ipv4 ipv6 proxy publicsuffix spdy websocket; do
    cp -av $d %{buildroot}/%{gopath}/src/%{import_path}/
 done
 
+%check
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/html
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/html/atom
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/idna
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/ipv4
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/ipv6
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/proxy
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/publicsuffix
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/spdy
+GOPATH=%{buildroot}/%{gopath} go test %{import_path}/websocket
+
 %files devel
 %defattr(-,root,root,-)
 %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
@@ -93,6 +105,10 @@ done
 %{gopath}/src/%{import_path}/websocket/*.go
 
 %changelog
+* Fri Jan 17 2014 Lokesh Mandvekar <lsm5 at redhat.com> 0-0.13.hg84a4013f96e0
+- golang exclusivearch for el6+
+- add check
+
 * Fri Jan 17 2014 Lokesh Mandvekar <lsm5 at redhat.com> 0-0.12.hg84a4013f96e0
 - revert golang >= 1.2 version requirement
 
-- 
cgit v0.10.2


From 33e846c5f6d246429e37063267a52ca2a17afcbc Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Mon, 29 Sep 2014 10:27:16 -0500
Subject: ExclusiveArch for el6

Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>

diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index 064d4bd..9747aab 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -15,7 +15,7 @@ Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
 Source0:    https://%{repo}.go.%{provider}%{provider_prefix}.%{provider_tld}/archive/%{rev}.tar.gz
-BuildArch:  noarch
+ExclusiveArch:  %{ix86} x86_64 %{arm}
 
 %description
 %{summary}
-- 
cgit v0.10.2


From e9081e32bef19f160a63aeab3e9ae2ab3f02f07d Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Mon, 24 Nov 2014 10:15:15 +0100
Subject: Extend import paths for golang.org/x/ - related: #1009967


diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index ffdb5c0..287ae10 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -8,9 +8,15 @@
 %global rev             90e232e2462dedc03bf3c93358da62d54d55dfb6
 %global shortrev        %(r=%{rev}; echo ${r:0:12})
 
+%global x_provider      golang
+%global x_provider_tld  org
+%global x_repo          net
+%global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
+%global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
+
 Name:       golang-%{provider}%{provider_prefix}-%{repo}
 Version:    0
-Release:    0.16.hg%{shortrev}%{?dist}
+Release:    0.17.hg%{shortrev}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -31,7 +37,7 @@ 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
-Summary:    Supplementary Go networking libraries
+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}
@@ -47,11 +53,43 @@ Provides:   golang(%{import_path}/publicsuffix) = %{version}-%{release}
 Provides:   golang(%{import_path}/spdy) = %{version}-%{release}
 Provides:   golang(%{import_path}/websocket) = %{version}-%{release}
 
+%package -n %{x_name}-devel
+BuildRequires:  golang >= 1.2.1-3
+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/transform)
+Requires:   golang >= 1.2.1-3
+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}/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}/ipv4) = %{version}-%{release}
+Provides:   golang(%{x_import_path}/ipv6) = %{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}/websocket) = %{version}-%{release}
+
 %description devel
 %{summary}
 
 This package contains library source intended for building other packages
-which use the supplementary Go networking libraries.
+which use the supplementary Go networking libraries with code.google.com/p/ imports.
+
+%description -n %{x_name}-devel
+
+This package contains library source intended for building other packages
+which use the supplementary Go text libraries with golang.org/x/ imports.
 
 %prep
 
@@ -61,8 +99,10 @@ which use the supplementary Go networking libraries.
 
 %install
 install -dp %{buildroot}/%{gopath}/src/%{import_path}
+install -dp %{buildroot}/%{gopath}/src/%{x_import_path}
 for dir in */ ; do
    cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
+   cp -rpav $dir %{buildroot}/%{gopath}/src/%{x_import_path}/
 done
 
 %check
@@ -74,17 +114,22 @@ done
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
+rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/testdata
+rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 
 %files devel
 %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
-%dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path}/*
-%dir %{gopath}/src/%{import_path}/*/*
-%{gopath}/src/%{import_path}/*/*.go
-%{gopath}/src/%{import_path}/*/*.s
-%{gopath}/src/%{import_path}/*/*/*.go
+%{gopath}/src/%{import_path}
+
+%files -n %{x_name}-devel
+%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
+%{gopath}/src/%{x_import_path}
 
 %changelog
+* Mon Nov 24 2014 jchaloup <jchaloup at redhat.com> - 0-0.17.hg90e232e2462d
+- Extend import paths for golang.org/x/
+  related: #1009967
+
 * Mon Sep 29 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0-0.16.hg90e232e2462d
 - Resolves: rhbz#1147193 - update to latest upstream revision 
   90e232e2462dedc03bf3c93358da62d54d55dfb6
-- 
cgit v0.10.2


From e126878e8adcd37ca9152cd1ed67702702dcdaf6 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Mon, 24 Nov 2014 10:15:15 +0100
Subject: Extend import paths for golang.org/x/ - related: #1009967


diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index ffdb5c0..287ae10 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -8,9 +8,15 @@
 %global rev             90e232e2462dedc03bf3c93358da62d54d55dfb6
 %global shortrev        %(r=%{rev}; echo ${r:0:12})
 
+%global x_provider      golang
+%global x_provider_tld  org
+%global x_repo          net
+%global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
+%global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
+
 Name:       golang-%{provider}%{provider_prefix}-%{repo}
 Version:    0
-Release:    0.16.hg%{shortrev}%{?dist}
+Release:    0.17.hg%{shortrev}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -31,7 +37,7 @@ 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
-Summary:    Supplementary Go networking libraries
+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}
@@ -47,11 +53,43 @@ Provides:   golang(%{import_path}/publicsuffix) = %{version}-%{release}
 Provides:   golang(%{import_path}/spdy) = %{version}-%{release}
 Provides:   golang(%{import_path}/websocket) = %{version}-%{release}
 
+%package -n %{x_name}-devel
+BuildRequires:  golang >= 1.2.1-3
+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/transform)
+Requires:   golang >= 1.2.1-3
+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}/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}/ipv4) = %{version}-%{release}
+Provides:   golang(%{x_import_path}/ipv6) = %{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}/websocket) = %{version}-%{release}
+
 %description devel
 %{summary}
 
 This package contains library source intended for building other packages
-which use the supplementary Go networking libraries.
+which use the supplementary Go networking libraries with code.google.com/p/ imports.
+
+%description -n %{x_name}-devel
+
+This package contains library source intended for building other packages
+which use the supplementary Go text libraries with golang.org/x/ imports.
 
 %prep
 
@@ -61,8 +99,10 @@ which use the supplementary Go networking libraries.
 
 %install
 install -dp %{buildroot}/%{gopath}/src/%{import_path}
+install -dp %{buildroot}/%{gopath}/src/%{x_import_path}
 for dir in */ ; do
    cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
+   cp -rpav $dir %{buildroot}/%{gopath}/src/%{x_import_path}/
 done
 
 %check
@@ -74,17 +114,22 @@ done
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
+rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/testdata
+rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 
 %files devel
 %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
-%dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path}/*
-%dir %{gopath}/src/%{import_path}/*/*
-%{gopath}/src/%{import_path}/*/*.go
-%{gopath}/src/%{import_path}/*/*.s
-%{gopath}/src/%{import_path}/*/*/*.go
+%{gopath}/src/%{import_path}
+
+%files -n %{x_name}-devel
+%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
+%{gopath}/src/%{x_import_path}
 
 %changelog
+* Mon Nov 24 2014 jchaloup <jchaloup at redhat.com> - 0-0.17.hg90e232e2462d
+- Extend import paths for golang.org/x/
+  related: #1009967
+
 * Mon Sep 29 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0-0.16.hg90e232e2462d
 - Resolves: rhbz#1147193 - update to latest upstream revision 
   90e232e2462dedc03bf3c93358da62d54d55dfb6
-- 
cgit v0.10.2


From 31bd9c2afcad290cd45bd47e1ee75879e3859e33 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Mon, 24 Nov 2014 10:15:15 +0100
Subject: Extend import paths for golang.org/x/ - related: #1009967


diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index 9747aab..933a1fd 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -8,9 +8,15 @@
 %global rev             90e232e2462dedc03bf3c93358da62d54d55dfb6
 %global shortrev        %(r=%{rev}; echo ${r:0:12})
 
+%global x_provider      golang
+%global x_provider_tld  org
+%global x_repo          net
+%global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
+%global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
+
 Name:       golang-%{provider}%{provider_prefix}-%{repo}
 Version:    0
-Release:    0.16.hg%{shortrev}%{?dist}
+Release:    0.17.hg%{shortrev}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -31,7 +37,7 @@ 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
-Summary:    Supplementary Go networking libraries
+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}
@@ -47,11 +53,43 @@ Provides:   golang(%{import_path}/publicsuffix) = %{version}-%{release}
 Provides:   golang(%{import_path}/spdy) = %{version}-%{release}
 Provides:   golang(%{import_path}/websocket) = %{version}-%{release}
 
+%package -n %{x_name}-devel
+BuildRequires:  golang >= 1.2.1-3
+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/transform)
+Requires:   golang >= 1.2.1-3
+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}/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}/ipv4) = %{version}-%{release}
+Provides:   golang(%{x_import_path}/ipv6) = %{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}/websocket) = %{version}-%{release}
+
 %description devel
 %{summary}
 
 This package contains library source intended for building other packages
-which use the supplementary Go networking libraries.
+which use the supplementary Go networking libraries with code.google.com/p/ imports.
+
+%description -n %{x_name}-devel
+
+This package contains library source intended for building other packages
+which use the supplementary Go text libraries with golang.org/x/ imports.
 
 %prep
 
@@ -61,8 +99,10 @@ which use the supplementary Go networking libraries.
 
 %install
 install -dp %{buildroot}/%{gopath}/src/%{import_path}
+install -dp %{buildroot}/%{gopath}/src/%{x_import_path}
 for dir in */ ; do
    cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
+   cp -rpav $dir %{buildroot}/%{gopath}/src/%{x_import_path}/
 done
 
 %check
@@ -74,17 +114,22 @@ done
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
+rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/testdata
+rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 
 %files devel
 %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
-%dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path}/*
-%dir %{gopath}/src/%{import_path}/*/*
-%{gopath}/src/%{import_path}/*/*.go
-%{gopath}/src/%{import_path}/*/*.s
-%{gopath}/src/%{import_path}/*/*/*.go
+%{gopath}/src/%{import_path}
+
+%files -n %{x_name}-devel
+%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
+%{gopath}/src/%{x_import_path}
 
 %changelog
+* Mon Nov 24 2014 jchaloup <jchaloup at redhat.com> - 0-0.17.hg90e232e2462d
+- Extend import paths for golang.org/x/
+  related: #1009967
+
 * Mon Sep 29 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0-0.16.hg90e232e2462d
 - Resolves: rhbz#1147193 - update to latest upstream revision 
   90e232e2462dedc03bf3c93358da62d54d55dfb6
-- 
cgit v0.10.2


From 30a92d9fd31cb5286e24f0fda6d587dc931f67cd Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Tue, 9 Dec 2014 15:47:20 +0100
Subject: Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
 - related: #1009967


diff --git a/.gitignore b/.gitignore
index b5c03c2..8214812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/84a4013f96e01fdd14b65d260a78b543e3702ee1.zip
-/90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+/937a34c9de13c766c814510f76bca091dee06028.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index 287ae10..accc0d2 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -5,7 +5,7 @@
 %global project         p
 %global repo            net
 %global import_path     %{provider_prefix}.%{provider}.%{provider_tld}/%{project}/go.%{repo}
-%global rev             90e232e2462dedc03bf3c93358da62d54d55dfb6
+%global rev             937a34c9de13c766c814510f76bca091dee06028
 %global shortrev        %(r=%{rev}; echo ${r:0:12})
 
 %global x_provider      golang
@@ -16,7 +16,7 @@
 
 Name:       golang-%{provider}%{provider_prefix}-%{repo}
 Version:    0
-Release:    0.17.hg%{shortrev}%{?dist}
+Release:    0.18.hg%{shortrev}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -105,12 +105,24 @@ for dir in */ ; do
    cp -rpav $dir %{buildroot}/%{gopath}/src/%{x_import_path}/
 done
 
+cd %{buildroot}/%{gopath}/src/%{import_path}/
+sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
+        $(find . -name '*.go')
+
 %check
-for dir in $(find . -mindepth 0 -maxdepth 3 -type d); do
-    if [ $(find $dir -maxdepth 1 -name *_test.go | wc -l) != '0' ]; then
-        GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/$dir
-    fi
-done
+# context, icmp failing
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/spdy
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/webdav
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv4
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/atom
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/idna
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/netutil
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/websocket
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/publicsuffix
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/proxy
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
@@ -126,6 +138,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Tue Dec 09 2014 jchaloup <jchaloup at redhat.com> - 0-0.18.hg937a34c9de13
+- Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
+  related: #1009967
+
 * Mon Nov 24 2014 jchaloup <jchaloup at redhat.com> - 0-0.17.hg90e232e2462d
 - Extend import paths for golang.org/x/
   related: #1009967
diff --git a/sources b/sources
index 553600a..85de557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81b9462a7e6052c0f01772a3738dd49d  90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+f2f3a1487d8fcbbefb5824d924d55305  937a34c9de13c766c814510f76bca091dee06028.tar.gz
-- 
cgit v0.10.2


From ef99c93d2d850f120f10cc148f85c7c0a61652e5 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Tue, 9 Dec 2014 15:47:20 +0100
Subject: Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
 - related: #1009967


diff --git a/.gitignore b/.gitignore
index b5c03c2..8214812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/84a4013f96e01fdd14b65d260a78b543e3702ee1.zip
-/90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+/937a34c9de13c766c814510f76bca091dee06028.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index 933a1fd..eabe25b 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -5,7 +5,7 @@
 %global project         p
 %global repo            net
 %global import_path     %{provider_prefix}.%{provider}.%{provider_tld}/%{project}/go.%{repo}
-%global rev             90e232e2462dedc03bf3c93358da62d54d55dfb6
+%global rev             937a34c9de13c766c814510f76bca091dee06028
 %global shortrev        %(r=%{rev}; echo ${r:0:12})
 
 %global x_provider      golang
@@ -16,7 +16,7 @@
 
 Name:       golang-%{provider}%{provider_prefix}-%{repo}
 Version:    0
-Release:    0.17.hg%{shortrev}%{?dist}
+Release:    0.18.hg%{shortrev}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -105,12 +105,24 @@ for dir in */ ; do
    cp -rpav $dir %{buildroot}/%{gopath}/src/%{x_import_path}/
 done
 
+cd %{buildroot}/%{gopath}/src/%{import_path}/
+sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
+        $(find . -name '*.go')
+
 %check
-for dir in $(find . -mindepth 0 -maxdepth 3 -type d); do
-    if [ $(find $dir -maxdepth 1 -name *_test.go | wc -l) != '0' ]; then
-        GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/$dir
-    fi
-done
+# context, icmp failing
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/spdy
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/webdav
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv4
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/atom
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/idna
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/netutil
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/websocket
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/publicsuffix
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/proxy
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
@@ -126,6 +138,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Tue Dec 09 2014 jchaloup <jchaloup at redhat.com> - 0-0.18.hg937a34c9de13
+- Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
+  related: #1009967
+
 * Mon Nov 24 2014 jchaloup <jchaloup at redhat.com> - 0-0.17.hg90e232e2462d
 - Extend import paths for golang.org/x/
   related: #1009967
diff --git a/sources b/sources
index 553600a..85de557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81b9462a7e6052c0f01772a3738dd49d  90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+f2f3a1487d8fcbbefb5824d924d55305  937a34c9de13c766c814510f76bca091dee06028.tar.gz
-- 
cgit v0.10.2


From f4f3f435a7ba6cb6abcb978e90070ebc5d439e7c Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Tue, 9 Dec 2014 15:47:20 +0100
Subject: Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
 - related: #1009967


diff --git a/.gitignore b/.gitignore
index b5c03c2..8214812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/84a4013f96e01fdd14b65d260a78b543e3702ee1.zip
-/90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+/937a34c9de13c766c814510f76bca091dee06028.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index 287ae10..accc0d2 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -5,7 +5,7 @@
 %global project         p
 %global repo            net
 %global import_path     %{provider_prefix}.%{provider}.%{provider_tld}/%{project}/go.%{repo}
-%global rev             90e232e2462dedc03bf3c93358da62d54d55dfb6
+%global rev             937a34c9de13c766c814510f76bca091dee06028
 %global shortrev        %(r=%{rev}; echo ${r:0:12})
 
 %global x_provider      golang
@@ -16,7 +16,7 @@
 
 Name:       golang-%{provider}%{provider_prefix}-%{repo}
 Version:    0
-Release:    0.17.hg%{shortrev}%{?dist}
+Release:    0.18.hg%{shortrev}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -105,12 +105,24 @@ for dir in */ ; do
    cp -rpav $dir %{buildroot}/%{gopath}/src/%{x_import_path}/
 done
 
+cd %{buildroot}/%{gopath}/src/%{import_path}/
+sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
+        $(find . -name '*.go')
+
 %check
-for dir in $(find . -mindepth 0 -maxdepth 3 -type d); do
-    if [ $(find $dir -maxdepth 1 -name *_test.go | wc -l) != '0' ]; then
-        GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/$dir
-    fi
-done
+# context, icmp failing
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/spdy
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/webdav
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv4
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/atom
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/idna
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/netutil
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/websocket
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/publicsuffix
+GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/proxy
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
@@ -126,6 +138,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Tue Dec 09 2014 jchaloup <jchaloup at redhat.com> - 0-0.18.hg937a34c9de13
+- Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
+  related: #1009967
+
 * Mon Nov 24 2014 jchaloup <jchaloup at redhat.com> - 0-0.17.hg90e232e2462d
 - Extend import paths for golang.org/x/
   related: #1009967
diff --git a/sources b/sources
index 553600a..85de557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81b9462a7e6052c0f01772a3738dd49d  90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+f2f3a1487d8fcbbefb5824d924d55305  937a34c9de13c766c814510f76bca091dee06028.tar.gz
-- 
cgit v0.10.2


From f0b07f3f86badfa201b5f7d00fdc880c2fd57e8d Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Fri, 19 Dec 2014 00:00:57 +0000
Subject: disable ipv6 and html/charset tests

Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>

diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index eabe25b..bbdaa6d 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -16,7 +16,7 @@
 
 Name:       golang-%{provider}%{provider_prefix}-%{repo}
 Version:    0
-Release:    0.18.hg%{shortrev}%{?dist}
+Release:    0.19.hg%{shortrev}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -115,11 +115,11 @@ GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/spdy
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/webdav
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv4
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
+#GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/atom
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/idna
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/netutil
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
+#GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/websocket
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/publicsuffix
 GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/proxy
@@ -138,6 +138,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Thu Dec 18 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0-0.19.hg937a34c9de13
+- Resolves: rhbz#1056185 disable ipv6 test
+- also disable html/charset test
+
 * Tue Dec 09 2014 jchaloup <jchaloup at redhat.com> - 0-0.18.hg937a34c9de13
 - Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
   related: #1009967
diff --git a/sources b/sources
index 85de557..60aa9a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2f3a1487d8fcbbefb5824d924d55305  937a34c9de13c766c814510f76bca091dee06028.tar.gz
+b3d38ac958e851624c5d86ad283c35b9  937a34c9de13c766c814510f76bca091dee06028.tar.gz
-- 
cgit v0.10.2


From 31fc8c453ae7a6aa0f7fb201f82b62643afed8d6 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri, 6 Feb 2015 14:35:16 +0100
Subject: Bump to upstream 71586c3cf98f806af322c5a361660eb046e00501 - Repo
 moved to github, changing spec file header and globals


diff --git a/.gitignore b/.gitignore
index 8214812..1baa2da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/937a34c9de13c766c814510f76bca091dee06028.tar.gz
+/net-71586c3.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index accc0d2..a5c0652 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -1,12 +1,11 @@
 %global debug_package   %{nil}
 %global provider_tld    com
-%global provider        google
-%global provider_prefix code
-%global project         p
+%global provider        github
+%global project         golang
 %global repo            net
-%global import_path     %{provider_prefix}.%{provider}.%{provider_tld}/%{project}/go.%{repo}
-%global rev             937a34c9de13c766c814510f76bca091dee06028
-%global shortrev        %(r=%{rev}; echo ${r:0:12})
+%global import_path     code.google.com/p/go.net
+%global commit          71586c3cf98f806af322c5a361660eb046e00501
+%global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global x_provider      golang
 %global x_provider_tld  org
@@ -14,14 +13,18 @@
 %global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
 %global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
 
-Name:       golang-%{provider}%{provider_prefix}-%{repo}
+Name:       golang-googlecode-net
 Version:    0
-Release:    0.18.hg%{shortrev}%{?dist}
+Release:    0.19.git%{shortcommit}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
-Source0:    https://%{repo}.go.%{provider}%{provider_prefix}.%{provider_tld}/archive/%{rev}.tar.gz
-BuildArch:  noarch
+Source0:    https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch:      noarch
+%else
+ExclusiveArch:  %{ix86} x86_64 %{arm}
+%endif
 
 %description
 %{summary}
@@ -93,7 +96,7 @@ which use the supplementary Go text libraries with golang.org/x/ imports.
 
 %prep
 
-%setup -qn net.go-%{shortrev}
+%setup -q -n %{repo}-%{commit}
 
 %build
 
@@ -111,18 +114,18 @@ sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
 
 %check
 # context, icmp failing
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/spdy
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/webdav
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv4
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/atom
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/idna
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/netutil
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/websocket
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/publicsuffix
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/proxy
+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}/ipv4
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html
+#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/charset
+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
+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
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
@@ -138,6 +141,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Fri Feb 06 2015 jchaloup <jchaloup at redhat.com> - 0-0.19.git71586c3
+- Bump to upstream 71586c3cf98f806af322c5a361660eb046e00501
+- Repo moved to github, changing spec file header and globals
+
 * Tue Dec 09 2014 jchaloup <jchaloup at redhat.com> - 0-0.18.hg937a34c9de13
 - Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
   related: #1009967
diff --git a/sources b/sources
index 85de557..dd0a03e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2f3a1487d8fcbbefb5824d924d55305  937a34c9de13c766c814510f76bca091dee06028.tar.gz
+ccc4eb5631b6e21a018691229f665838  net-71586c3.tar.gz
-- 
cgit v0.10.2


From 35bd19aa170d146717018e242fc63b613fc0ff71 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri, 6 Feb 2015 14:35:16 +0100
Subject: Bump to upstream 71586c3cf98f806af322c5a361660eb046e00501 - Repo
 moved to github, changing spec file header and globals


diff --git a/.gitignore b/.gitignore
index 8214812..1baa2da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/937a34c9de13c766c814510f76bca091dee06028.tar.gz
+/net-71586c3.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index accc0d2..a5c0652 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -1,12 +1,11 @@
 %global debug_package   %{nil}
 %global provider_tld    com
-%global provider        google
-%global provider_prefix code
-%global project         p
+%global provider        github
+%global project         golang
 %global repo            net
-%global import_path     %{provider_prefix}.%{provider}.%{provider_tld}/%{project}/go.%{repo}
-%global rev             937a34c9de13c766c814510f76bca091dee06028
-%global shortrev        %(r=%{rev}; echo ${r:0:12})
+%global import_path     code.google.com/p/go.net
+%global commit          71586c3cf98f806af322c5a361660eb046e00501
+%global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global x_provider      golang
 %global x_provider_tld  org
@@ -14,14 +13,18 @@
 %global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
 %global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
 
-Name:       golang-%{provider}%{provider_prefix}-%{repo}
+Name:       golang-googlecode-net
 Version:    0
-Release:    0.18.hg%{shortrev}%{?dist}
+Release:    0.19.git%{shortcommit}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
-Source0:    https://%{repo}.go.%{provider}%{provider_prefix}.%{provider_tld}/archive/%{rev}.tar.gz
-BuildArch:  noarch
+Source0:    https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch:      noarch
+%else
+ExclusiveArch:  %{ix86} x86_64 %{arm}
+%endif
 
 %description
 %{summary}
@@ -93,7 +96,7 @@ which use the supplementary Go text libraries with golang.org/x/ imports.
 
 %prep
 
-%setup -qn net.go-%{shortrev}
+%setup -q -n %{repo}-%{commit}
 
 %build
 
@@ -111,18 +114,18 @@ sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
 
 %check
 # context, icmp failing
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/spdy
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/webdav
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv4
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/atom
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/idna
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/netutil
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/websocket
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/publicsuffix
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/proxy
+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}/ipv4
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html
+#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/charset
+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
+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
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
@@ -138,6 +141,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Fri Feb 06 2015 jchaloup <jchaloup at redhat.com> - 0-0.19.git71586c3
+- Bump to upstream 71586c3cf98f806af322c5a361660eb046e00501
+- Repo moved to github, changing spec file header and globals
+
 * Tue Dec 09 2014 jchaloup <jchaloup at redhat.com> - 0-0.18.hg937a34c9de13
 - Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
   related: #1009967
diff --git a/sources b/sources
index 85de557..dd0a03e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2f3a1487d8fcbbefb5824d924d55305  937a34c9de13c766c814510f76bca091dee06028.tar.gz
+ccc4eb5631b6e21a018691229f665838  net-71586c3.tar.gz
-- 
cgit v0.10.2


From a3a538f40d575df295776354e53f864acf98a75f Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri, 6 Feb 2015 14:35:16 +0100
Subject: Bump to upstream 71586c3cf98f806af322c5a361660eb046e00501 - Repo
 moved to github, changing spec file header and globals


diff --git a/.gitignore b/.gitignore
index 8214812..1baa2da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/937a34c9de13c766c814510f76bca091dee06028.tar.gz
+/net-71586c3.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index bbdaa6d..ee6c8bd 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -1,12 +1,11 @@
 %global debug_package   %{nil}
 %global provider_tld    com
-%global provider        google
-%global provider_prefix code
-%global project         p
+%global provider        github
+%global project         golang
 %global repo            net
-%global import_path     %{provider_prefix}.%{provider}.%{provider_tld}/%{project}/go.%{repo}
-%global rev             937a34c9de13c766c814510f76bca091dee06028
-%global shortrev        %(r=%{rev}; echo ${r:0:12})
+%global import_path     code.google.com/p/go.net
+%global commit          71586c3cf98f806af322c5a361660eb046e00501
+%global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global x_provider      golang
 %global x_provider_tld  org
@@ -14,14 +13,18 @@
 %global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
 %global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
 
-Name:       golang-%{provider}%{provider_prefix}-%{repo}
+Name:       golang-googlecode-net
 Version:    0
-Release:    0.19.hg%{shortrev}%{?dist}
+Release:    0.20.git%{shortcommit}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
-Source0:    https://%{repo}.go.%{provider}%{provider_prefix}.%{provider_tld}/archive/%{rev}.tar.gz
+Source0:    https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch:      noarch
+%else
 ExclusiveArch:  %{ix86} x86_64 %{arm}
+%endif
 
 %description
 %{summary}
@@ -93,7 +96,7 @@ which use the supplementary Go text libraries with golang.org/x/ imports.
 
 %prep
 
-%setup -qn net.go-%{shortrev}
+%setup -q -n %{repo}-%{commit}
 
 %build
 
@@ -111,18 +114,18 @@ sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
 
 %check
 # context, icmp failing
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/spdy
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/webdav
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv4
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html
-#GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/atom
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/idna
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/netutil
-#GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/websocket
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/publicsuffix
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/proxy
+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}/ipv4
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html
+#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/charset
+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
+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
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
@@ -138,6 +141,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Fri Feb 06 2015 jchaloup <jchaloup at redhat.com> - 0-0.20.git71586c3
+- Bump to upstream 71586c3cf98f806af322c5a361660eb046e00501
+- Repo moved to github, changing spec file header and globals
+
 * Thu Dec 18 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0-0.19.hg937a34c9de13
 - Resolves: rhbz#1056185 disable ipv6 test
 - also disable html/charset test
diff --git a/sources b/sources
index 60aa9a3..dd0a03e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3d38ac958e851624c5d86ad283c35b9  937a34c9de13c766c814510f76bca091dee06028.tar.gz
+ccc4eb5631b6e21a018691229f665838  net-71586c3.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/golang-googlecode-net.git/commit/?h=f21&id=831c8037915791fa7c6181ca6fafc8c2e2791a39


More information about the scm-commits mailing list