diff --git a/golang-github-armon-go-metrics.spec b/golang-github-armon-go-metrics.spec
index 921dcb0..45b6786 100644
--- a/golang-github-armon-go-metrics.spec
+++ b/golang-github-armon-go-metrics.spec
@@ -1,34 +1,76 @@
+%if 0%{?fedora} || 0%{?rhel} == 6
+%global with_devel 1
+%global with_bundled 0
+%global with_debug 0
+# Tests require configured server statsite
+%global with_check 0
+%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         armon
 %global repo            go-metrics
 # https://github.com/armon/go-metrics
-%global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path     %{provider_prefix}
 %global commit          a54701ebec11868993bc198c3f315353e9de2ed6
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-%{provider}-%{project}-%{repo}
 Version:        0
-Release:        0.1.git%{shortcommit}%{?dist}
+Release:        0.2.git%{shortcommit}%{?dist}
 Summary:        Exporting performance and runtime metrics to external metrics systems
 License:        MIT
 URL:            https://%{import_path}
 Source0:        https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-BuildArch:      noarch
+# 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
-ExclusiveArch:  %{ix86} x86_64 %{arm}
+BuildRequires:   golang
 %endif
 
 %description
 %{summary}
+
+%if 0%{?with_devel}
 %package devel
 Summary:       %{summary}
-BuildRequires: golang >= 1.2.1-3
+BuildArch:     noarch
+
+%if 0%{?with_check}
 BuildRequires: golang(github.com/prometheus/client_golang/prometheus)
+%endif
+
 Requires:      golang(github.com/prometheus/client_golang/prometheus)
+
 Provides:      golang(%{import_path}) = %{version}-%{release}
 Provides:      golang(%{import_path}/prometheus) = %{version}-%{release}
 
@@ -36,7 +78,40 @@ Provides:      golang(%{import_path}/prometheus) = %{version}-%{release}
 %{summary}
 
 This package contains library source intended for
-building other packages which use %{project}/%{repo}.
+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}
@@ -44,31 +119,64 @@ building other packages which use %{project}/%{repo}.
 %build
 
 %install
+# source codes for building projects
+%if 0%{?with_devel}
 install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-chmod -x *.go
-cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/
-
-# copy directories
-for file in ./* ; do
-    if [ -d $file ]; then
-        cp -rpav $file %{buildroot}%{gopath}/src/%{import_path}/
-    fi
+# find all *.go but no *_test.go files and generate devel.file-list
+for file in $(find . -iname "*.go" \! -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
 done
+%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
+%endif
 
 %check
-
-%files devel
-%if 0%{?fedora}
-%license LICENSE
-%doc README.md
+%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
-%doc README.md LICENSE
+function gotest { go test "$@"; }
 %endif
+%endif
+
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+gotest %{import_path}
+%endif
+
+%if 0%{?with_devel}
+%files devel -f devel.file-list
+%copying LICENSE
+%doc README.md
 %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%{gopath}/src/%{import_path}
+%dir %{gopath}/src/%{import_path}
+%endif
+
+%if 0%{?with_unit_test}
+%files unit-test -f unit-test.file-list
+%copying LICENSE
+%doc README.md
+%endif
 
 %changelog
+* Thu Jul 30 2015 Fridolin Pokorny <fpokorny@redhat.com> - 0-0.2.gita54701e
+- Update of spec file to spec-2.0
+  resolves: #1248645
+
 * Wed Apr 15 2015 jchaloup <jchaloup@redhat.com> - 0-0.1.gita54701e
 - First package for Fedora
   resolves: #1211990
+