commit 71eabce184e905f928239d22e08af2cc926e6882 Author: Jan Chaloupka jchaloup@redhat.com Date: Sun Mar 8 23:15:16 2015 +0100
Add the latest commit of depricated code.google.com/o/goauth2 afe77d958c701557ec5dc56f6936fcc194d15520 - related: #1141822
.gitignore | 1 + golang-googlecode-goauth2.spec | 54 ++++++++++++++++++++++++++++++++++++++---- sources | 1 + 3 files changed, 51 insertions(+), 5 deletions(-) --- diff --git a/.gitignore b/.gitignore index ceeb0ba..e07103e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /oauth2-267028f.tar.gz +/afe77d958c701557ec5dc56f6936fcc194d15520.tar.gz diff --git a/golang-googlecode-goauth2.spec b/golang-googlecode-goauth2.spec index adf0732..b6c289d 100644 --- a/golang-googlecode-goauth2.spec +++ b/golang-googlecode-goauth2.spec @@ -1,3 +1,4 @@ +%global debug_package %{nil} %global provider golang %global provider_tld org %global repo oauth2 @@ -5,13 +6,25 @@ %global commit 267028f9bc2a1177dc5769be38c68c1b4fbe91c4 %global shortcommit %(r=%{commit}; echo ${r:0:7})
+%global gc_rev afe77d958c701557ec5dc56f6936fcc194d15520 +%global gc_shortrev %(r=%{gc_rev}; echo ${r:0:12}) +%global gc_provider google +%global gc_provider_sub code +%global gc_provider_tld com +%global gc_repo goauth2 +%global gc_import_path %{gc_provider_sub}.%{gc_provider}.%{gc_provider_tld}/p/%{gc_repo} +%global gc_name golang-%{gc_provider}%{gc_provider_sub}-%{gc_repo} + +%global x_name golang-%{provider}%{provider_tld}-%{repo} + Name: golang-googlecode-goauth2 Version: 0 -Release: 0.5.hg%{shortcommit}%{?dist} +Release: 0.6.hg%{shortcommit}%{?dist} Summary: OAuth 2.0 for Go clients License: BSD URL: http://%%7Bimport_path%7D Source0: https://github.com/%%7Bproject%7D/%%7Brepo%7D/archive/%%7Bcommit%7D/%%7Brepo... +Source1: https://%%7Bgc_repo%7D.%%7Bgc_provider%7D%%7Bgc_provider_sub%7D.%%7Bgc_provi... %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 BuildArch: noarch %else @@ -21,7 +34,7 @@ ExclusiveArch: %{ix86} x86_64 %{arm} %description %{summary}
-%package devel +%package -n %{x_name}-devel BuildRequires: golang >= 1.2.1-3 BuildRequires: golang(google.golang.org/appengine) BuildRequires: golang(google.golang.org/appengine/urlfetch) @@ -40,15 +53,31 @@ Provides: golang(%{import_path}/jws) = %{version}-%{release} Provides: golang(%{import_path}/jwt) = %{version}-%{release} Provides: golang(%{import_path}/internal) = %{version}-%{release}
-%description devel +%description -n %{x_name}-devel %{summary}
This package contains library source intended for building other packages which use the OAuth 2.0 for Go clients library.
+%package -n %{gc_name}-devel +BuildRequires: golang >= 1.2.1-3 +Requires: golang >= 1.2.1-3 +Summary: OAuth 2.0 for Go clients +Provides: golang(%{gc_import_path}/appengine/serviceaccount) = %{version}-%{release} +Provides: golang(%{gc_import_path}/compute/serviceaccount) = %{version}-%{release} +Provides: golang(%{gc_import_path}/oauth) = %{version}-%{release} +Provides: golang(%{gc_import_path}/oauth/jwt) = %{version}-%{release} + +%description -n %{gc_name}-devel +%{summary} + +This package contains library source intended for building other packages +which use the OAuth 2.0 for Go clients library. + %prep -%setup -n %{repo}-%{commit} -q +%setup -q -n %{gc_repo}-%{gc_shortrev} -T -b 1 +%setup -q -n %{repo}-%{commit}
%build
@@ -59,17 +88,32 @@ for d in google github jws jwt internal; do cp -pav $d %{buildroot}/%{gopath}/src/%{import_path}/ done
+pushd ../%{gc_repo}-%{gc_shortrev} +install -d %{buildroot}/%{gopath}/src/%{gc_import_path} +for d in appengine compute lib oauth; do + cp -pav $d %{buildroot}/%{gopath}/src/%{gc_import_path}/ +done + + %check # 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 +%files -n %{x_name}-devel %doc AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE README.md %{gopath}/src/%{import_path}
+%files -n %{gc_name}-devel +%doc AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE README.md +%{gopath}/src/%{gc_import_path} + %changelog +* Sun Mar 08 2015 jchaloup jchaloup@redhat.com - 0-0.6.hg267028f +- Add the latest commit of depricated code.google.com/o/goauth2 afe77d958c701557ec5dc56f6936fcc194d15520 + related: #1141822 + * Thu Jan 22 2015 jchaloup jchaloup@redhat.com - 0-0.5.hgafe77d958c70 - Bump to upstream 267028f9bc2a1177dc5769be38c68c1b4fbe91c4 related: #1141822 diff --git a/sources b/sources index 06d190a..7a28219 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 86f3495b9909f8da26405a5cc3047346 oauth2-267028f.tar.gz +ef6521032c1072f7e70634140cc52a19 afe77d958c701557ec5dc56f6936fcc194d15520.tar.gz
golang@lists.fedoraproject.org