[golang-gopkg-yaml/f20] Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1 - related: #1141875
by Jan Chaloupka
commit 007e55bd2ba5b6cd4d8af0ebe767176cacaa6e56
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Dec 10 12:20:06 2014 +0100
Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1
- related: #1141875
.gitignore | 1 +
golang-gopkg-yaml.spec | 79 ++++++++++++++++++++++++++++++++++++++++++-----
sources | 1 +
3 files changed, 72 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55ac9b7..93af28c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/yaml-1b9791953ba4027efaeb728c7355e542a203be5e.tar.gz
+/yaml-d466437aa4adc35830964cffc5b5f262c63ddcb4.tar.gz
diff --git a/golang-gopkg-yaml.spec b/golang-gopkg-yaml.spec
index 1c940f8..3023dbc 100644
--- a/golang-gopkg-yaml.spec
+++ b/golang-gopkg-yaml.spec
@@ -1,16 +1,28 @@
%global debug_package %{nil}
-%global commit 1b9791953ba4027efaeb728c7355e542a203be5e
+%global commit d466437aa4adc35830964cffc5b5f262c63ddcb4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global import_path gopkg.in/v1/yaml
+%global import_path gopkg.in/v2/yaml
+%global import_path_sec gopkg.in/yaml.v2
+
+%global v1_commit 1b9791953ba4027efaeb728c7355e542a203be5e
+%global v1_shortcommit %(c=%{v1_commit}; echo ${c:0:7})
+%global v1_import_path gopkg.in/v1/yaml
+%global v1_import_path_sec gopkg.in/yaml.v1
+
Name: golang-gopkg-yaml
Version: 1
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Enables Go programs to comfortably encode and decode YAML values
License: LGPLv3 with exceptions
URL: http://%{import_path}
Source0: https://github.com/go-yaml/yaml/archive/%{commit}/yaml-%{commit}.tar.gz
+Source1: https://github.com/go-yaml/yaml/archive/%{v1_commit}/yaml-%{v1_commit}.ta...
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
BuildArch: noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm}
+%endif
%description
%{summary}
@@ -19,11 +31,10 @@ BuildArch: noarch
BuildRequires: golang >= 1.2.1-3
Requires: golang >= 1.2.1-3
Summary: Enables Go programs to comfortably encode and decode YAML values
-Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{v1_import_path}) = %{version}-%{release}
+Provides: golang(%{v1_import_path_sec}) = %{version}-%{release}
%description devel
-%{summary}
-
The yaml package enables Go programs to comfortably encode and decode YAML
values. It was developed within Canonical as part of the juju project, and
is based on a pure Go port of the well-known libyaml C library to parse and
@@ -34,23 +45,73 @@ anchors, tags, etc. There are still a few missing bits, such as document
merging, base-60 floats (huh?), and multi-document unmarshalling. These
features are not hard to add, and will be introduced as necessary.
+%package devel-v2
+BuildRequires: golang >= 1.2.1-3
+BuildRequires: golang(gopkg.in/check.v1)
+Requires: golang >= 1.2.1-3
+Summary: Enables Go programs to comfortably encode and decode YAML values
+Provides: golang(%{import_path}) = %{version}-%{release}
+Provides: golang(%{import_path_sec}) = %{version}-%{release}
+
+%description devel-v2
+The yaml package enables Go programs to comfortably encode and decode YAML
+values. It was developed within Canonical as part of the juju project, and
+is based on a pure Go port of the well-known libyaml C library to parse and
+generate YAML data quickly and reliably.
+
+The yaml package supports most of YAML 1.1 and 1.2,
+including support for anchors, tags, map merging, etc.
+Multi-document unmarshalling is not yet implemented, and base-60 floats
+from YAML 1.1 are purposefully not supported since they're a poor design
+ and are gone in YAML 1.2.
+
+
%prep
%setup -n yaml-%{commit} -q
+%setup -n yaml-%{v1_commit} -T -b 1
%build
%install
+install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{v1_import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+
+pushd ../yaml-%{commit}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
+popd
+
+%check
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{v1_import_path_sec}
+pushd ../yaml-%{v1_commit}
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path_sec}
+popd
%files devel
%doc LICENSE LICENSE.libyaml README.md
-%dir %{gopath}/src/gopkg.in
%dir %{gopath}/src/gopkg.in/v1
-%dir %{gopath}/src/%{import_path}
-%{gopath}/src/%{import_path}/*.go
+%{gopath}/src/%{v1_import_path}
+%{gopath}/src/%{v1_import_path_sec}
+
+%files devel-v2
+%doc LICENSE LICENSE.libyaml README.md
+%dir %{gopath}/src/gopkg.in/v2
+%{gopath}/src/%{import_path}
+%{gopath}/src/%{import_path_sec}
%changelog
+* Wed Dec 10 2014 jchaloup <jchaloup(a)redhat.com> - 1-5
+- Update to gopkg.in/check.v2 but still provide gopkg.in/check.v1
+ related: #1141875
+
+* Fri Oct 10 2014 jchaloup <jchaloup(a)redhat.com> - 1-4
+- Adding go test and deps on gopkg.in/check.v1
+- Adding another Provides
+
* Mon Sep 15 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1-3
- Resolves: rhbz#1141875 - newpackage
- no debug_package
diff --git a/sources b/sources
index 2d759f6..da65a5d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
db4790a1e1c2ce0ce068434efb4f01dc yaml-1b9791953ba4027efaeb728c7355e542a203be5e.tar.gz
+2f235793d937f59e262c95f8b4b46813 yaml-d466437aa4adc35830964cffc5b5f262c63ddcb4.tar.gz
9 years, 5 months
[docker-io] use commit bb24f99, /etc/docker instead of /.docker
by Lokesh Mandvekar
commit 6d5ebbb734f8e8d38f9498609a21a7a361d69dfc
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Dec 9 21:15:35 2014 +0000
use commit bb24f99, /etc/docker instead of /.docker
NVR: docker-io-1.3.2-6.gitbb24f99
- update to upstream commit bb24f99d741cd8d6a8b882afc929c15c633c39cb
- patch source to use /etc/docker instead of /.docker
- include DOCKER_TMPDIR in /etc/sysconfig/docker
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
docker-io.spec | 26 ++++++++++++++++----------
docker.sysconfig | 5 +++++
sources | 2 +-
3 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index b0fc207..719162d 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,19 +10,19 @@
%global repo %{project}
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 39fa2faad2f3d6fa5133de4eb740677202f53ef4
+%global commit bb24f99d741cd8d6a8b882afc929c15c633c39cb
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{repo}-io
Version: 1.3.2
-Release: 5%{?dist}
+Release: 6.git%{shortcommit}%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
# only x86_64 for now: https://github.com/docker/docker/issues/136
ExclusiveArch: x86_64
-Source0: https://%{import_path}/archive/v%{version}.tar.gz
-#Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+#Source0: https://%{import_path}/archive/v%{version}.tar.gz
+Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
@@ -49,12 +49,12 @@ BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(systemd)
# Use appropriate NVR for systemd-units to ensure SocketUser and SocketGroup are available
%if 0%{?fedora} >= 21
-Requires: systemd-units >= 214
+Requires: systemd >= 214
%else
%if 0%{?fedora} == 20
-Requires: systemd-units >= 208-20
+Requires: systemd >= 208-20
%else
-Requires: systemd-units >= 204-20
+Requires: systemd >= 204-20
%endif
%endif
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 6
@@ -189,11 +189,12 @@ specific logic.
The import paths of import_path/pkg/...
%prep
-%setup -qn %{repo}-%{version}
+%setup -qn %{repo}-%{commit}
rm -rf vendor/src/github.com/{coreos,godbus,gorilla,kr,Sirupsen,syndtr,tchap}
find . -name "*.go" \
-print |\
xargs sed -i 's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g'
+sed -i 's/\.docker/\/etc\/docker/g' docker/flags.go
sed -i 's/\!bash//g' contrib/completion/bash/docker
%build
@@ -213,11 +214,11 @@ cp contrib/syntax/vim/README.md README-vim-syntax.md
%install
# install binary
install -d %{buildroot}%{_bindir}
-install -p -m 755 bundles/%{version}/dynbinary/docker-%{version} %{buildroot}%{_bindir}/docker
+install -p -m 755 bundles/%{version}-dev/dynbinary/docker-%{version}-dev %{buildroot}%{_bindir}/docker
# install dockerinit
install -d %{buildroot}%{_libexecdir}/docker
-install -p -m 755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}%{_libexecdir}/docker/dockerinit
+install -p -m 755 bundles/%{version}-dev/dynbinary/dockerinit-%{version}-dev %{buildroot}%{_libexecdir}/docker/dockerinit
# install manpages
install -d %{buildroot}%{_mandir}/man1
@@ -312,6 +313,11 @@ exit 0
%{gopath}/src/%{import_path}/pkg/*
%changelog
+* Tue Dec 09 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-6.gitbb24f99
+- use /etc/docker instead of /.docker
+- use upstream master commit bb24f99d741cd8d6a8b882afc929c15c633c39cb
+- include DOCKER_TMPDIR variable in /etc/sysconfig/docker
+
* Mon Dec 08 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.3.2-5
- Revert to using upstream release 1.3.2
diff --git a/docker.sysconfig b/docker.sysconfig
index c8c301a..405ee91 100644
--- a/docker.sysconfig
+++ b/docker.sysconfig
@@ -1 +1,6 @@
OPTIONS=--selinux-enabled
+
+# Location used for temporary files, such as those created by
+# docker load and build operations. Default is /var/lib/docker/tmp
+# Can be overriden by setting the following environment variable.
+# DOCKER_TMPDIR=/var/tmp
diff --git a/sources b/sources
index bf5a889..7973e03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09af621b62626dd18a2f2994435236ca v1.3.2.tar.gz
+c9564e24470361a28373da1b4d1d4acd docker-bb24f99.tar.gz
9 years, 5 months
[golang-googlecode-net/el6] Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028 - related: #1009967
by Jan Chaloupka
commit ef99c93d2d850f120f10cc148f85c7c0a61652e5
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Dec 9 15:47:20 2014 +0100
Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
- related: #1009967
.gitignore | 3 +--
golang-googlecode-net.spec | 30 +++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 25 insertions(+), 10 deletions(-)
---
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(a)redhat.com> - 0-0.18.hg937a34c9de13
+- Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
+ related: #1009967
+
* Mon Nov 24 2014 jchaloup <jchaloup(a)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
9 years, 5 months
[golang-googlecode-net] Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028 - related: #1009967
by Jan Chaloupka
commit 780a70a09dddeeb36c5b02c9015a02003da951a2
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Dec 9 15:47:20 2014 +0100
Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
- related: #1009967
.gitignore | 3 +--
golang-googlecode-net.spec | 33 +++++++++++++++++++++++----------
sources | 2 +-
3 files changed, 25 insertions(+), 13 deletions(-)
---
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 a06d420..f1e7015 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,15 +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
- if [ "$dir" == "./context" ]; then
- continue
- fi
- 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
@@ -129,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(a)redhat.com> - 0-0.18.hg937a34c9de13
+- Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
+ related: #1009967
+
* Mon Nov 24 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.17.hg90e232e2462d
- Extend import paths for golang.org/x/
- context test failing on master
diff --git a/sources b/sources
index 553600a..85de557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81b9462a7e6052c0f01772a3738dd49d 90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+f2f3a1487d8fcbbefb5824d924d55305 937a34c9de13c766c814510f76bca091dee06028.tar.gz
9 years, 5 months
[golang-googlecode-net/f21] Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028 - related: #1009967
by Jan Chaloupka
commit 30a92d9fd31cb5286e24f0fda6d587dc931f67cd
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Dec 9 15:47:20 2014 +0100
Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
- related: #1009967
.gitignore | 3 +--
golang-googlecode-net.spec | 30 +++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 25 insertions(+), 10 deletions(-)
---
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(a)redhat.com> - 0-0.18.hg937a34c9de13
+- Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
+ related: #1009967
+
* Mon Nov 24 2014 jchaloup <jchaloup(a)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
9 years, 5 months
[golang-googlecode-net/f20] Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028 - related: #1009967
by Jan Chaloupka
commit f4f3f435a7ba6cb6abcb978e90070ebc5d439e7c
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Dec 9 15:47:20 2014 +0100
Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
- related: #1009967
.gitignore | 3 +--
golang-googlecode-net.spec | 30 +++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 25 insertions(+), 10 deletions(-)
---
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(a)redhat.com> - 0-0.18.hg937a34c9de13
+- Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
+ related: #1009967
+
* Mon Nov 24 2014 jchaloup <jchaloup(a)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
9 years, 5 months
