diff --git a/golang-googlecode-go-crypto.spec b/golang-googlecode-go-crypto.spec
index 9ba398d..e664eee 100644
--- a/golang-googlecode-go-crypto.spec
+++ b/golang-googlecode-go-crypto.spec
@@ -1,130 +1,198 @@
+%if 0%{?fedora} || 0%{?rhel} == 6
+%global with_devel 1
+%global with_bundled 0
+%global with_debug 0
+%global with_check 1
+%global with_unit_test 1
+%else
+%global with_devel 0
+%global with_bundled 0
+%global with_debug 0
+%global with_check 0
+%global with_unit_test 0
+%endif
+
+%if 0%{?with_debug}
+%global _dwz_low_mem_die_limit 0
+%else
 %global debug_package   %{nil}
+%endif
+
+%define copying() \
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \
+%license %{*} \
+%else \
+%doc %{*} \
+%endif
+
 %global provider        github
 %global provider_tld    com
 %global project         golang
 %global repo            crypto
 # https://github.com/golang/crypto
-%global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path     golang.org/x/crypto
 %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 shortcommit     %(c=%{commit}; echo ${c:0:7})
+
+%global gc_import_path     code.google.com/p/go.crypto
 %global gc_rev             69e2a90ed92d03812364aeb947b7068dc42e561e
 %global gc_shortrev        %(r=%{rev}; echo ${r:0:12})
 
-%global x_provider      golang
-%global x_provider_tld  org
-%global x_repo          crypto
-%global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
-%global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
+%global x_name          golang-golangorg-crypto
 
-Name:           golang-%{gc_provider}%{gc_provider_sub}-go-%{gc_repo}
+Name:           golang-googlecode-go-crypto
 Version:        0
-Release:        0.4.git%{shortcommit}%{?dist}
+Release:        0.5.git%{shortcommit}%{?dist}
 Summary:        Supplementary Go cryptography libraries
 License:        BSD
-URL:            https://%{import_path}
-Source0:        https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-BuildArch:      noarch
+URL:            https://%{provider_prefix}
+Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+
+# If go_arches not defined fall through to implicit golang archs
+%if 0%{?go_arches:1}
+ExclusiveArch:  %{go_arches}
 %else
-ExclusiveArch:  %{ix86} x86_64 %{arm}
+ExclusiveArch:   %{ix86} x86_64 %{arm}
+%endif
+# If gccgo_arches does not fit or is not defined fall through to golang
+%ifarch 0%{?gccgo_arches}
+BuildRequires:   gcc-go >= %{gccgo_min_vers}
+%else
+BuildRequires:   golang
 %endif
 
 %description
 %{summary}
 
+%if 0%{?with_devel}
 %package devel
-BuildRequires:  golang >= 1.2.1-3
-Summary:        %{summary}
-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}
+Summary:       %{summary}
+BuildArch:     noarch
+
+%if 0%{?with_check}
+%endif
+
+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}
 
-This package contains library source intended for building other packages
-which use the supplementary Go crypto libraries with code.google.com/p/ imports.
+This package contains library source intended for
+building other packages which use import path with
+%{gc_import_path} prefix.
 
 %package -n %{x_name}-devel
-BuildRequires:  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}
+Summary:       %{summary}
+BuildArch:     noarch
+
+%if 0%{?with_check}
+%endif
+
+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}
 
 %description -n %{x_name}-devel
 %{summary}
 
-This package contains library source intended for building other packages
-which use the supplementary Go crypto libraries with golang.org/x/ imports.
+This package contains library source intended for
+building other packages which use import path with
+%{import_path} prefix.
+%endif
+
+%if 0%{?with_unit_test}
+%package unit-test
+Summary:         Unit tests for %{name} package
+# If go_arches not defined fall through to implicit golang archs
+%if 0%{?go_arches:1}
+ExclusiveArch:  %{go_arches}
+%else
+ExclusiveArch:   %{ix86} x86_64 %{arm}
+%endif
+# If gccgo_arches does not fit or is not defined fall through to golang
+%ifarch 0%{?gccgo_arches}
+BuildRequires:   gcc-go >= %{gccgo_min_vers}
+%else
+BuildRequires:   golang
+%endif
+
+%if 0%{?with_check}
+#Here comes all BuildRequires: PACKAGE the unit tests
+#in %%check section need for running
+%endif
+
+# test subpackage tests code from devel subpackage
+Requires:        %{name}-devel = %{version}-%{release}
+
+%description unit-test
+%{summary}
+
+This package contains unit tests for project
+providing packages with %{import_path} prefix.
+%endif
 
 %prep
 %setup -q -n %{repo}-%{commit}
@@ -132,63 +200,114 @@ which use the supplementary Go crypto libraries with golang.org/x/ imports.
 %build
 
 %install
-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/%{gc_import_path}/
-    cp -rpav $dir %{buildroot}%{gopath}/src/%{x_import_path}/
+# source codes for building projects
+%if 0%{?with_devel}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+install -d -p %{buildroot}/%{gopath}/src/%{gc_import_path}/
+for ext in go s; do
+	# find all *.go but no *_test.go files and generate devel.file-list
+	for file in $(find . -iname "*.$ext" \! -iname "*_test.go") ; do
+	    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
+	    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+	    echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
+	    install -d -p %{buildroot}/%{gopath}/src/%{gc_import_path}/$(dirname $file)
+	    cp -pav $file %{buildroot}/%{gopath}/src/%{gc_import_path}/$file
+	    echo "%%{gopath}/src/%%{gc_import_path}/$file" >> gc_devel.file-list
+	done
 done
-
-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' \
+pushd %{buildroot}/%{gopath}/src/%{gc_import_path}
+sed -i 's/"golang\.org\/x\/crypto/"code\.google\.com\/p\/crypto/g' \
         $(find . -name '*.go')
+popd
+%endif
+
+# testing files for this project
+%if 0%{?with_unit_test}
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
+# find all *_test.go files and generate unit-test.file-list
+for file in $(find . -iname "*_test.go"); do
+    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
+    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+    echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
+done
+for file in ./sha3/testdata/keccakKats.json.deflate; do
+install -d -p %{buildroot}/%{gopath}/src/%{import_path}/sha3/testdata
+    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
+    echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
+done
+%endif
 
 %check
-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/%{gc_import_path}
-
-%files -n %{x_name}-devel
-%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
-%{gopath}/src/%{x_import_path}
+%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
+%ifarch 0%{?gccgo_arches}
+function gotest { %{gcc_go_test} "$@"; }
+%else
+%if 0%{?golang_test:1}
+function gotest { %{golang_test} "$@"; }
+%else
+function gotest { go test "$@"; }
+%endif
+%endif
+
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+gotest %{import_path}/bcrypt
+gotest %{import_path}/blowfish
+gotest %{import_path}/bn256
+gotest %{import_path}/cast5
+gotest %{import_path}/curve25519
+gotest %{import_path}/hkdf
+gotest %{import_path}/md4
+gotest %{import_path}/nacl/box
+gotest %{import_path}/nacl/secretbox
+# undefined: elliptic.P224
+#gotest %%{import_path}/ocsp
+gotest %{import_path}/openpgp
+gotest %{import_path}/openpgp/armor
+gotest %{import_path}/openpgp/clearsign
+gotest %{import_path}/openpgp/elgamal
+gotest %{import_path}/openpgp/packet
+gotest %{import_path}/openpgp/s2k
+gotest %{import_path}/otr
+gotest %{import_path}/pbkdf2
+gotest %{import_path}/poly1305
+gotest %{import_path}/ripemd160
+gotest %{import_path}/salsa20
+gotest %{import_path}/salsa20/salsa
+gotest %{import_path}/scrypt
+gotest %{import_path}/sha3
+# undefined: elliptic.P224
+#gotest %%{import_path}/ssh
+gotest %{import_path}/ssh/agent
+gotest %{import_path}/ssh/terminal
+gotest %{import_path}/ssh/test
+gotest %{import_path}/twofish
+gotest %{import_path}/xtea
+gotest %{import_path}/xts
+%endif
+
+%if 0%{?with_devel}
+%files -n %{x_name}-devel -f devel.file-list
+%copying LICENSE
+%doc CONTRIBUTING.md README AUTHORS CONTRIBUTORS
+%dir %{gopath}/src/%{import_path}
+
+%files devel -f gc_devel.file-list
+%copying LICENSE
+%doc CONTRIBUTING.md README AUTHORS CONTRIBUTORS
+%dir %{gopath}/src/%{gc_import_path}
+%endif
+
+%if 0%{?with_unit_test}
+%files unit-test -f unit-test.file-list
+%copying LICENSE
+%doc CONTRIBUTING.md README AUTHORS CONTRIBUTORS
+%endif
 
 %changelog
+* Wed Aug 19 2015 jchaloup <jchaloup@redhat.com> - 0-0.5.gitc57d4a7
+- Update spec file to spec-2.0
+  related: #1231618
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.4.gitc57d4a7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
@@ -203,4 +322,3 @@ go test %{x_import_path}/xts
 * Thu Dec 04 2014 jchaloup <jchaloup@redhat.com> - 0-0.1.hg69e2a90ed92d
 - First package for Fedora
   resolves: #1148704
-