From ff3b7b73cf25d121eb053c90f87b1411a5acf8b7 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jul 23 2015 16:07:44 +0000 Subject: Bump to upstream 446d52dd4018303a13b36097e26d0888aca5d6ef - related: #1230677 --- diff --git a/.gitignore b/.gitignore index aa7be8f..4245493 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/net-7dbad50.tar.gz +/net-446d52d.tar.gz diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec index abdbd61..7d5c310 100644 --- a/golang-googlecode-net.spec +++ b/golang-googlecode-net.spec @@ -1,10 +1,27 @@ +%if 0%{?fedora} +%global with_devel 1 +%global with_bundled 0 +%global with_debug 1 +%global with_check 1 +%else +%global with_devel 0 +%global with_bundled 1 +%global with_debug 0 +%global with_check 0 +%endif + +%if 0%{?with_debug} +# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 +%global _dwz_low_mem_die_limit 0 +%else %global debug_package %{nil} +%endif %global provider_tld com %global provider github %global project golang %global repo net %global import_path code.google.com/p/go.net -%global commit 7dbad50ab5b31073856416cdcfeb2796d682f844 +%global commit 446d52dd4018303a13b36097e26d0888aca5d6ef %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global x_provider golang @@ -18,7 +35,7 @@ Name: golang-googlecode-net Version: 0 -Release: 0.22.git%{shortcommit}%{?dist} +Release: 0.23.git%{shortcommit}%{?dist} Summary: Supplementary Go networking libraries License: BSD URL: http://%{import_path} @@ -32,6 +49,7 @@ ExclusiveArch: %{ix86} x86_64 %{arm} %description %{summary} +%if 0%{?with_devel} %package devel BuildRequires: golang >= 1.2.1-3 BuildRequires: golang(code.google.com/p/go.text/encoding) @@ -60,12 +78,13 @@ 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/nettest) = %{version}-%{release} +Provides: golang(%{import_path}/internal/timeseries) = %{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}/trace) = %{version}-%{release} Provides: golang(%{import_path}/webdav) = %{version}-%{release} Provides: golang(%{import_path}/websocket) = %{version}-%{release} @@ -98,12 +117,13 @@ 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/nettest) = %{version}-%{release} +Provides: golang(%{x_import_path}/internal/timeseries) = %{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}/trace) = %{version}-%{release} Provides: golang(%{x_import_path}/webdav) = %{version}-%{release} Provides: golang(%{x_import_path}/websocket) = %{version}-%{release} @@ -117,6 +137,7 @@ which use the supplementary Go networking libraries with code.google.com/p/ impo This package contains library source intended for building other packages which use the supplementary Go text libraries with golang.org/x/ imports. +%endif %prep @@ -125,6 +146,7 @@ which use the supplementary Go text libraries with golang.org/x/ imports. %build %install +%if 0%{?with_devel} install -dp %{buildroot}/%{gopath}/src/%{import_path} install -dp %{buildroot}/%{gopath}/src/%{x_import_path} for dir in */ ; do @@ -135,31 +157,36 @@ done cd %{buildroot}/%{gopath}/src/%{import_path}/ sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \ $(find . -name '*.go') +%endif %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}/ipv4 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html +%if 0%{?with_check} +export GOPATH=%{buildroot}%{gopath}:%{gopath} +go test %{import_path}/html +go test %{import_path}/html/atom %if 0%{?fedora} == 20 || 0%{?fedora} == 21 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/charset +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 +go test %{import_path}/idna +go test %{import_path}/internal/timeseries +#go test %{import_path}/ipv4 %if 0%{?fedora} == 20 || 0%{?fedora} == 21 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ipv6 +go test %{import_path}/ipv6 +%endif +go test %{import_path}/netutil +go test %{import_path}/proxy +go test %{import_path}/publicsuffix +go test %{import_path}/trace +#go test %{import_path}/webdav +go test %{import_path}/websocket %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 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 +%if 0%{?with_devel} %files devel %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README %{gopath}/src/%{import_path} @@ -167,8 +194,13 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata %files -n %{x_name}-devel %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README %{gopath}/src/%{x_import_path} +%endif %changelog +* Thu Jul 23 2015 jchaloup - 0-0.23.git446d52d +- Bump to upstream 446d52dd4018303a13b36097e26d0888aca5d6ef + related: #1230677 + * Wed Jun 17 2015 Fedora Release Engineering - 0-0.22.git7dbad50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index cc9578a..83148f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6222294f35e04d521887070cdeb68f4b net-7dbad50.tar.gz +1d7d694fed476584fead75168653faaf net-446d52d.tar.gz