From 450350e8dc8db09ec0428c346861894f27629546 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sep 29 2014 09:49:00 +0000 Subject: update to 0.2.1 with upstream master Signed-off-by: Lokesh Mandvekar --- diff --git a/.gitignore b/.gitignore index 3c7dc06..4c9c56f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /go-dockerclient-d639515.tar.gz +/go-dockerclient-0236a64.tar.gz diff --git a/golang-github-fsouza-go-dockerclient.spec b/golang-github-fsouza-go-dockerclient.spec index de2cba0..080b604 100644 --- a/golang-github-fsouza-go-dockerclient.spec +++ b/golang-github-fsouza-go-dockerclient.spec @@ -1,27 +1,23 @@ %global debug_package %{nil} %global import_path github.com/fsouza/go-dockerclient -%global gopath %{_datadir}/gocode -%global commit a735a3dbbfdd1822886f6b4235318c8809b41538 +%global commit 0236a64c6c4bd563ec277ba00e370cc753e1677c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: golang-github-fsouza-go-dockerclient -Version: 0 -Release: 0.3.git%{shortcommit}%{?dist} -Summary: Client for the Docker remote API -License: BSD -URL: https://%{import_path} -Source0: https://%{import_path}/archive/%{commit}/%{name}-%{commit}.tar.gz -%if 0%{?fedora} >= 19 -BuildArch: noarch -%else -ExclusiveArch: %{ix86} x86_64 %{arm} -%endif +Name: golang-github-fsouza-go-dockerclient +Version: 0.2.1 +Release: 1.git%{shortcommit}%{?dist} +Summary: Client for the Docker remote API +License: BSD +URL: https://%{import_path} +Source0: https://%{import_path}/archive/%{commit}/go-dockerclient-%{shortcommit}.tar.gz +BuildArch: noarch %description %{summary} %package devel -Requires: golang +BuildRequires: golang >= 1.2.1-3 +Requires: golang >= 1.2.1-3 Summary: Client for the Docker remote API Provides: golang(%{import_path}) = %{version}-%{release} Provides: golang(%{import_path}/engine) = %{version}-%{release} @@ -35,30 +31,26 @@ This package contains library source intended for building other packages which use fsouza/go-dockerclient. %prep -%setup -n %{name}-%{commit} +%setup -qn go-dockerclient-%{commit} %build %install -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/{engine,testing,utils} -for d in . engine testing utils; do - cp -av $d/*.go %{buildroot}/%{gopath}/src/%{import_path}/$d -done +install -d -p %{buildroot}/%{gopath}/src/%{import_path} +cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path} %files devel -%defattr(-,root,root,-) -%doc LICENSE README.markdown -%dir %attr(755,root,root) %{gopath} -%dir %attr(755,root,root) %{gopath}/src -%dir %attr(755,root,root) %{gopath}/src/github.com -%dir %attr(755,root,root) %{gopath}/src/github.com/fsouza -%dir %attr(755,root,root) %{gopath}/src/github.com/fsouza/go-dockerclient +%doc AUTHORS DOCKER-LICENSE LICENSE README.markdown +%dir %{gopath}/src/github.com/fsouza +%dir %{gopath}/src/%{import_path} %{gopath}/src/%{import_path}/*.go -%{gopath}/src/%{import_path}/engine/*.go -%{gopath}/src/%{import_path}/testing/*.go -%{gopath}/src/%{import_path}/utils/*.go %changelog +* Mon Sep 29 2014 Lokesh Mandvekar - 0.2.1-1.git0236a64 +- update to upstream commit 0236a64c6c4bd563ec277ba00e370cc753e1677c +- don't own dirs owned by golang, don't redefine gopath +- preserve timestamps of copied files + * Tue Jul 22 2014 Colin Walters - Update to newer version for Kubernetes work diff --git a/sources b/sources index 54de816..15c2c3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33f8570b38b7ecac219f9f3cee758ded go-dockerclient-d639515.tar.gz +4a769207923cfb1dbb1bd48a42117841 go-dockerclient-0236a64.tar.gz