From 510a99138ef6e67de03fff1c4ee734851f49219d Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jun 15 2015 05:53:17 +0000 Subject: Repository has moved to github.com/golang/crypto, updating spec file accordingly - resolves: #1231618 --- diff --git a/.gitignore b/.gitignore index a74ac64..d30d53d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/69e2a90ed92d03812364aeb947b7068dc42e561e.tar.gz +/crypto-c57d4a7.tar.gz diff --git a/golang-googlecode-go-crypto.spec b/golang-googlecode-go-crypto.spec index 1848dd0..83ad38f 100644 --- a/golang-googlecode-go-crypto.spec +++ b/golang-googlecode-go-crypto.spec @@ -1,12 +1,22 @@ %global debug_package %{nil} -%global provider google -%global provider_sub code +%global provider github %global provider_tld com -%global project p +%global project golang %global repo crypto -%global import_path %{provider_sub}.%{provider}.%{provider_tld}/%{project}/go.%{repo} -%global rev 69e2a90ed92d03812364aeb947b7068dc42e561e -%global shortrev %(r=%{rev}; echo ${r:0:12}) +# https://github.com/golang/crypto +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global commit c57d4a71915a248dbad846d60825145062b4c18e +%global shortcommit %(r=%{commit}; echo ${r:0:7}) + +%global gc_provider google +%global gc_provider_sub code +%global gc_provider_tld com +%global gc_project p +%global gc_repo crypto +# https://code.google.com/p/crypto +%global gc_import_path %{gc_provider_sub}.%{gc_provider}.%{gc_provider_tld}/%{gc_project}/go.%{gc_repo} +%global gc_rev 69e2a90ed92d03812364aeb947b7068dc42e561e +%global gc_shortrev %(r=%{rev}; echo ${r:0:12}) %global x_provider golang %global x_provider_tld org @@ -14,13 +24,13 @@ %global x_import_path %{x_provider}.%{x_provider_tld}/x/%{x_repo} %global x_name golang-%{x_provider}%{x_provider_tld}-%{repo} -Name: golang-%{provider}%{provider_sub}-go-%{repo} +Name: golang-%{gc_provider}%{gc_provider_sub}-go-%{gc_repo} Version: 0 -Release: 0.2.hg%{shortrev}%{?dist} +Release: 0.3.git%{shortcommit}%{?dist} Summary: Supplementary Go cryptography libraries License: BSD URL: https://%{import_path} -Source0: https://%{repo}.go.%{provider}%{provider_sub}.%{provider_tld}/archive/%{rev}.tar.gz +Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 BuildArch: noarch %else @@ -32,41 +42,40 @@ ExclusiveArch: %{ix86} x86_64 %{arm} %package devel BuildRequires: golang >= 1.2.1-3 -Requires: golang >= 1.2.1-3 Summary: %{summary} -Provides: golang(%{import_path}/bcrypt) = %{version}-%{release} -Provides: golang(%{import_path}/blowfish) = %{version}-%{release} -Provides: golang(%{import_path}/bn256) = %{version}-%{release} -Provides: golang(%{import_path}/cast5) = %{version}-%{release} -Provides: golang(%{import_path}/curve25519) = %{version}-%{release} -Provides: golang(%{import_path}/hkdf) = %{version}-%{release} -Provides: golang(%{import_path}/md4) = %{version}-%{release} -Provides: golang(%{import_path}/nacl/box) = %{version}-%{release} -Provides: golang(%{import_path}/nacl/secretbox) = %{version}-%{release} -Provides: golang(%{import_path}/ocsp) = %{version}-%{release} -Provides: golang(%{import_path}/openpgp) = %{version}-%{release} -Provides: golang(%{import_path}/openpgp/armor) = %{version}-%{release} -Provides: golang(%{import_path}/openpgp/clearsign) = %{version}-%{release} -Provides: golang(%{import_path}/openpgp/elgamal) = %{version}-%{release} -Provides: golang(%{import_path}/openpgp/errors) = %{version}-%{release} -Provides: golang(%{import_path}/openpgp/packet) = %{version}-%{release} -Provides: golang(%{import_path}/openpgp/s2k) = %{version}-%{release} -Provides: golang(%{import_path}/otr) = %{version}-%{release} -Provides: golang(%{import_path}/pbkdf2) = %{version}-%{release} -Provides: golang(%{import_path}/poly1305) = %{version}-%{release} -Provides: golang(%{import_path}/ripemd160) = %{version}-%{release} -Provides: golang(%{import_path}/salsa20) = %{version}-%{release} -Provides: golang(%{import_path}/salsa20/salsa) = %{version}-%{release} -Provides: golang(%{import_path}/scrypt) = %{version}-%{release} -Provides: golang(%{import_path}/sha3) = %{version}-%{release} -Provides: golang(%{import_path}/ssh) = %{version}-%{release} -Provides: golang(%{import_path}/ssh/agent) = %{version}-%{release} -Provides: golang(%{import_path}/ssh/terminal) = %{version}-%{release} -Provides: golang(%{import_path}/ssh/test) = %{version}-%{release} -Provides: golang(%{import_path}/ssh/testdata) = %{version}-%{release} -Provides: golang(%{import_path}/twofish) = %{version}-%{release} -Provides: golang(%{import_path}/xtea) = %{version}-%{release} -Provides: golang(%{import_path}/xts) = %{version}-%{release} +Provides: golang(%{gc_import_path}/bcrypt) = %{version}-%{release} +Provides: golang(%{gc_import_path}/blowfish) = %{version}-%{release} +Provides: golang(%{gc_import_path}/bn256) = %{version}-%{release} +Provides: golang(%{gc_import_path}/cast5) = %{version}-%{release} +Provides: golang(%{gc_import_path}/curve25519) = %{version}-%{release} +Provides: golang(%{gc_import_path}/hkdf) = %{version}-%{release} +Provides: golang(%{gc_import_path}/md4) = %{version}-%{release} +Provides: golang(%{gc_import_path}/nacl/box) = %{version}-%{release} +Provides: golang(%{gc_import_path}/nacl/secretbox) = %{version}-%{release} +Provides: golang(%{gc_import_path}/ocsp) = %{version}-%{release} +Provides: golang(%{gc_import_path}/openpgp) = %{version}-%{release} +Provides: golang(%{gc_import_path}/openpgp/armor) = %{version}-%{release} +Provides: golang(%{gc_import_path}/openpgp/clearsign) = %{version}-%{release} +Provides: golang(%{gc_import_path}/openpgp/elgamal) = %{version}-%{release} +Provides: golang(%{gc_import_path}/openpgp/errors) = %{version}-%{release} +Provides: golang(%{gc_import_path}/openpgp/packet) = %{version}-%{release} +Provides: golang(%{gc_import_path}/openpgp/s2k) = %{version}-%{release} +Provides: golang(%{gc_import_path}/otr) = %{version}-%{release} +Provides: golang(%{gc_import_path}/pbkdf2) = %{version}-%{release} +Provides: golang(%{gc_import_path}/poly1305) = %{version}-%{release} +Provides: golang(%{gc_import_path}/ripemd160) = %{version}-%{release} +Provides: golang(%{gc_import_path}/salsa20) = %{version}-%{release} +Provides: golang(%{gc_import_path}/salsa20/salsa) = %{version}-%{release} +Provides: golang(%{gc_import_path}/scrypt) = %{version}-%{release} +Provides: golang(%{gc_import_path}/sha3) = %{version}-%{release} +Provides: golang(%{gc_import_path}/ssh) = %{version}-%{release} +Provides: golang(%{gc_import_path}/ssh/agent) = %{version}-%{release} +Provides: golang(%{gc_import_path}/ssh/terminal) = %{version}-%{release} +Provides: golang(%{gc_import_path}/ssh/test) = %{version}-%{release} +Provides: golang(%{gc_import_path}/ssh/testdata) = %{version}-%{release} +Provides: golang(%{gc_import_path}/twofish) = %{version}-%{release} +Provides: golang(%{gc_import_path}/xtea) = %{version}-%{release} +Provides: golang(%{gc_import_path}/xts) = %{version}-%{release} %description devel %{summary} @@ -76,42 +85,40 @@ which use the supplementary Go crypto libraries with code.google.com/p/ imports. %package -n %{x_name}-devel BuildRequires: golang >= 1.2.1-3 -Requires: golang >= 1.2.1-3 Summary: %{summary} -Provides: golang(%{x_import_path}/bcrypt) = %{version}-%{release} -Provides: golang(%{x_import_path}/blowfish) = %{version}-%{release} -Provides: golang(%{x_import_path}/bn256) = %{version}-%{release} -Provides: golang(%{x_import_path}/cast5) = %{version}-%{release} -Provides: golang(%{x_import_path}/curve25519) = %{version}-%{release} -Provides: golang(%{x_import_path}/hkdf) = %{version}-%{release} -Provides: golang(%{x_import_path}/md4) = %{version}-%{release} -Provides: golang(%{x_import_path}/nacl/box) = %{version}-%{release} -Provides: golang(%{x_import_path}/nacl/secretbox) = %{version}-%{release} -Provides: golang(%{x_import_path}/ocsp) = %{version}-%{release} -Provides: golang(%{x_import_path}/openpgp) = %{version}-%{release} -Provides: golang(%{x_import_path}/openpgp/armor) = %{version}-%{release} -Provides: golang(%{x_import_path}/openpgp/clearsign) = %{version}-%{release} -Provides: golang(%{x_import_path}/openpgp/elgamal) = %{version}-%{release} -Provides: golang(%{x_import_path}/openpgp/errors) = %{version}-%{release} -Provides: golang(%{x_import_path}/openpgp/packet) = %{version}-%{release} -Provides: golang(%{x_import_path}/openpgp/s2k) = %{version}-%{release} -Provides: golang(%{x_import_path}/otr) = %{version}-%{release} -Provides: golang(%{x_import_path}/pbkdf2) = %{version}-%{release} -Provides: golang(%{x_import_path}/poly1305) = %{version}-%{release} -Provides: golang(%{x_import_path}/ripemd160) = %{version}-%{release} -Provides: golang(%{x_import_path}/salsa20) = %{version}-%{release} -Provides: golang(%{x_import_path}/salsa20/salsa) = %{version}-%{release} -Provides: golang(%{x_import_path}/scrypt) = %{version}-%{release} -Provides: golang(%{x_import_path}/sha3) = %{version}-%{release} -Provides: golang(%{x_import_path}/ssh) = %{version}-%{release} -Provides: golang(%{x_import_path}/ssh/agent) = %{version}-%{release} -Provides: golang(%{x_import_path}/ssh/terminal) = %{version}-%{release} -Provides: golang(%{x_import_path}/ssh/test) = %{version}-%{release} -Provides: golang(%{x_import_path}/ssh/testdata) = %{version}-%{release} -Provides: golang(%{x_import_path}/twofish) = %{version}-%{release} -Provides: golang(%{x_import_path}/xtea) = %{version}-%{release} -Provides: golang(%{x_import_path}/xts) = %{version}-%{release} - +Provides: golang(%{x_import_path}/bcrypt) = %{version}-%{release} +Provides: golang(%{x_import_path}/blowfish) = %{version}-%{release} +Provides: golang(%{x_import_path}/bn256) = %{version}-%{release} +Provides: golang(%{x_import_path}/cast5) = %{version}-%{release} +Provides: golang(%{x_import_path}/curve25519) = %{version}-%{release} +Provides: golang(%{x_import_path}/hkdf) = %{version}-%{release} +Provides: golang(%{x_import_path}/md4) = %{version}-%{release} +Provides: golang(%{x_import_path}/nacl/box) = %{version}-%{release} +Provides: golang(%{x_import_path}/nacl/secretbox) = %{version}-%{release} +Provides: golang(%{x_import_path}/ocsp) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/armor) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/clearsign) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/elgamal) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/errors) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/packet) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/s2k) = %{version}-%{release} +Provides: golang(%{x_import_path}/otr) = %{version}-%{release} +Provides: golang(%{x_import_path}/pbkdf2) = %{version}-%{release} +Provides: golang(%{x_import_path}/poly1305) = %{version}-%{release} +Provides: golang(%{x_import_path}/ripemd160) = %{version}-%{release} +Provides: golang(%{x_import_path}/salsa20) = %{version}-%{release} +Provides: golang(%{x_import_path}/salsa20/salsa) = %{version}-%{release} +Provides: golang(%{x_import_path}/scrypt) = %{version}-%{release} +Provides: golang(%{x_import_path}/sha3) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh/agent) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh/terminal) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh/test) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh/testdata) = %{version}-%{release} +Provides: golang(%{x_import_path}/twofish) = %{version}-%{release} +Provides: golang(%{x_import_path}/xtea) = %{version}-%{release} +Provides: golang(%{x_import_path}/xts) = %{version}-%{release} %description -n %{x_name}-devel %{summary} @@ -120,66 +127,72 @@ This package contains library source intended for building other packages which use the supplementary Go crypto libraries with golang.org/x/ imports. %prep -%setup -q -n %{repo}.go-%{shortrev} +%setup -q -n %{repo}-%{commit} %build %install -install -d -p %{buildroot}%{gopath}/src/%{import_path}/ +install -d -p %{buildroot}%{gopath}/src/%{gc_import_path}/ install -d -p %{buildroot}%{gopath}/src/%{x_import_path}/ for dir in */ ; do - cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}/ + cp -rpav $dir %{buildroot}%{gopath}/src/%{gc_import_path}/ cp -rpav $dir %{buildroot}%{gopath}/src/%{x_import_path}/ done -cd %{buildroot}/%{gopath}/src/%{import_path}/ +cd %{buildroot}/%{gopath}/src/%{gc_import_path}/ # from https://groups.google.com/forum/#!topic/golang-nuts/eD8dh3T9yyA, first post sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \ $(find . -name '*.go') %check -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/xts -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/xtea -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/twofish -# fails on ssh/keys_test.go:55: undefined: elliptic.P224 -#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/ssh -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ssh/test -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ssh/terminal -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ssh/agent -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/sha3 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/scrypt -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/salsa20 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/salsa20/salsa -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ripemd160 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/poly1305 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/pbkdf2 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/otr -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/openpgp -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/openpgp/s2k -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/openpgp/packet -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/openpgp/elgamal -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/openpgp/clearsign -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/openpgp/armor -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ocsp -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/nacl/secretbox -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/nacl/box -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/md4 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/hkdf -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/curve25519 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/cast5 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/bn256 -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/blowfish -GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/bcrypt +export GOPATH=%{buildroot}%{gopath}:%{gopath} +go test %{x_import_path}/bcrypt +go test %{x_import_path}/blowfish +go test %{x_import_path}/bn256 +go test %{x_import_path}/cast5 +go test %{x_import_path}/curve25519 +go test %{x_import_path}/hkdf +go test %{x_import_path}/md4 +go test %{x_import_path}/nacl/box +go test %{x_import_path}/nacl/secretbox +# ocsp/ocsp.go:161: undefined: elliptic.P224 +#go test %{x_import_path}/ocsp +go test %{x_import_path}/openpgp +go test %{x_import_path}/openpgp/armor +go test %{x_import_path}/openpgp/clearsign +go test %{x_import_path}/openpgp/elgamal +go test %{x_import_path}/openpgp/packet +go test %{x_import_path}/openpgp/s2k +go test %{x_import_path}/otr +go test %{x_import_path}/pbkdf2 +go test %{x_import_path}/poly1305 +go test %{x_import_path}/ripemd160 +go test %{x_import_path}/salsa20 +go test %{x_import_path}/salsa20/salsa +go test %{x_import_path}/scrypt +go test %{x_import_path}/sha3 +# fails on ssh/keys_test.go:55: undefined: elliptic.P224 +#go test %{x_import_path}/ssh +go test %{x_import_path}/ssh/agent +go test %{x_import_path}/ssh/terminal +go test %{x_import_path}/ssh/test +go test %{x_import_path}/twofish +go test %{x_import_path}/xtea +go test %{x_import_path}/xts %files devel %doc LICENSE README -%{gopath}/src/%{import_path}/ +%{gopath}/src/%{gc_import_path} %files -n %{x_name}-devel %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README %{gopath}/src/%{x_import_path} %changelog +* Mon Jun 15 2015 jchaloup - 0-0.3.git%{shortcommit} +- Repository has moved to github.com/golang/crypto, updating spec file accordingly + resolves: #1231618 + * Sun Dec 14 2014 Lokesh Mandvekar - 0-0.2.hg69e2a90ed92d - Correct Source0 URL - Correct paths for golang.org/x/crypto/* diff --git a/sources b/sources index 63d1cc0..f99c673 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9363d90c8b9783360a0a5fa26f402430 69e2a90ed92d03812364aeb947b7068dc42e561e.tar.gz +52fb9e7e790adb3d3790214201415b47 crypto-c57d4a7.tar.gz