[golang-googlecode-goauth2/f20] Bump to upstream 267028f9bc2a1177dc5769be38c68c1b4fbe91c4 - related: #1141822

Jan Chaloupka jchaloup at fedoraproject.org
Tue Jan 27 13:41:39 UTC 2015


commit 59134593658adadd58397ac6db0954af2757b1a0
Author: Jan Chaloupka <jchaloup at redhat.com>
Date:   Thu Jan 22 21:08:44 2015 +0100

    Bump to upstream 267028f9bc2a1177dc5769be38c68c1b4fbe91c4
    - related: #1141822

 .gitignore                     |    2 +-
 golang-googlecode-goauth2.spec |   74 +++++++++++++++++++--------------------
 sources                        |    2 +-
 3 files changed, 38 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a722c1..ceeb0ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/afe77d958c701557ec5dc56f6936fcc194d15520.tar.gz
+/oauth2-267028f.tar.gz
diff --git a/golang-googlecode-goauth2.spec b/golang-googlecode-goauth2.spec
index 1f97101..82ffdb8 100644
--- a/golang-googlecode-goauth2.spec
+++ b/golang-googlecode-goauth2.spec
@@ -1,18 +1,17 @@
-%global provider        google
-%global provider_sub    code
-%global provider_tld    com
-%global repo            goauth2
-%global import_path     %{provider_sub}.%{provider}.%{provider_tld}/p/%{repo}
-%global rev             afe77d958c701557ec5dc56f6936fcc194d15520
-%global shortrev        %(r=%{rev}; echo ${r:0:12})
+%global provider        golang
+%global provider_tld    org
+%global repo            oauth2
+%global import_path     %{provider}.%{provider_tld}/x/%{repo}
+%global commit          267028f9bc2a1177dc5769be38c68c1b4fbe91c4
+%global shortcommit     %(r=%{commit}; echo ${r:0:7})
 
-Name:           golang-%{provider}%{provider_sub}-%{repo}
+Name:           golang-googlecode-goauth2 
 Version:        0
-Release:        0.4.hg%{shortrev}%{?dist}
+Release:        0.5.hg%{shortcommit}%{?dist}
 Summary:        OAuth 2.0 for Go clients
 License:        BSD
 URL:            http://%{import_path}
-Source0:        https://%{repo}.%{provider}%{provider_sub}.%{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
@@ -23,15 +22,23 @@ ExclusiveArch:  %{ix86} x86_64 %{arm}
 %{summary}
 
 %package devel
-BuildRequires:  golang >= 1.2.1-3
+BuildRequires:    golang >= 1.2.1-3
+BuildRequires:    golang(google.golang.org/appengine)
+BuildRequires:    golang(google.golang.org/appengine/urlfetch)
+BuildRequires:    golang(google.golang.org/cloud/compute/metadata)
+BuildRequires:    golang(golang.org/x/net/context)
 Requires:       golang >= 1.2.1-3
+Requires:       golang(google.golang.org/appengine)
+Requires:       golang(google.golang.org/appengine/urlfetch)
+Requires:       golang(google.golang.org/cloud/compute/metadata)
+Requires:       golang(golang.org/x/net/context)
 Summary:        OAuth 2.0 for Go clients
 Provides:       golang(%{import_path}) = %{version}-%{release}
-Provides:       golang(%{import_path}/oauth) = %{version}-%{release}
-Provides:       golang(%{import_path}/appengine) = %{version}-%{release}
-Provides:       golang(%{import_path}/appengine/serviceaccount) = %{version}-%{release}
-Provides:       golang(%{import_path}/compute) = %{version}-%{release}
-Provides:       golang(%{import_path}/compute/serviceaccount) = %{version}-%{release}
+Provides:       golang(%{import_path}/google) = %{version}-%{release}
+Provides:       golang(%{import_path}/github) = %{version}-%{release}
+Provides:       golang(%{import_path}/jws) = %{version}-%{release}
+Provides:       golang(%{import_path}/jwt) = %{version}-%{release}
+Provides:       golang(%{import_path}/internal) = %{version}-%{release}
 
 %description devel
 %{summary}
@@ -41,41 +48,32 @@ which use the OAuth 2.0 for Go clients library.
 
 
 %prep
-%setup -n %{repo}-%{shortrev} -q
+%setup -n %{repo}-%{commit} -q
 
 %build
 
 %install
 install -d %{buildroot}/%{gopath}/src/%{import_path}
-for d in oauth appengine compute; do
+cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/
+for d in google github jws jwt internal; do
    cp -pav $d %{buildroot}/%{gopath}/src/%{import_path}/
 done
 
 %check
-GOPATH=%{gopath}:%{buildroot}/%{gopath} go test %{import_path}/oauth
+# test fails in no buildable go sources
+#GOPATH={gopath}:{buildroot}/{gopath} go test {import_path}/google
+#GOPATH={gopath}:{buildroot}/{gopath} go test {import_path}/jwt
+GOPATH=%{gopath}:%{buildroot}/%{gopath} go test %{import_path}/internal
 
 %files devel
-%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
-%dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path}/oauth
-%dir %{gopath}/src/%{import_path}/oauth/example
-%dir %{gopath}/src/%{import_path}/oauth/jwt
-%dir %{gopath}/src/%{import_path}/oauth/jwt/example
-%dir %{gopath}/src/%{import_path}/appengine
-%dir %{gopath}/src/%{import_path}/appengine/serviceaccount
-%dir %{gopath}/src/%{import_path}/compute
-%dir %{gopath}/src/%{import_path}/compute/serviceaccount
-%{gopath}/src/%{import_path}/oauth/*.go
-# oauth/example/oauthreq.go is executable in the tarball, undo it
-%attr(644,-,-) %{gopath}/src/%{import_path}/oauth/example/*.go
-%{gopath}/src/%{import_path}/oauth/jwt/*.go
-%{gopath}/src/%{import_path}/oauth/jwt/example/*.go
-%{gopath}/src/%{import_path}/oauth/jwt/example/*.json
-%{gopath}/src/%{import_path}/oauth/jwt/example/*.pem
-%{gopath}/src/%{import_path}/appengine/serviceaccount/*.go
-%{gopath}/src/%{import_path}/compute/serviceaccount/*.go
+%doc AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE README.md
+%{gopath}/src/%{import_path}
 
 %changelog
+* Thu Jan 22 2015 jchaloup <jchaloup at redhat.com> - 0-0.5.hgafe77d958c70
+- Bump to upstream 267028f9bc2a1177dc5769be38c68c1b4fbe91c4
+  related: #1141822
+
 * Tue Nov 18 2014 jchaloup <jchaloup at redhat.com> - 0-0.4.hgafe77d958c70
 - Choose the correct architecture
   related: #1141822
diff --git a/sources b/sources
index 6f14f98..06d190a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0946637172953f5dd7ab42ca4fdac3e1  afe77d958c701557ec5dc56f6936fcc194d15520.tar.gz
+86f3495b9909f8da26405a5cc3047346  oauth2-267028f.tar.gz


More information about the scm-commits mailing list