diff --git a/.gitignore b/.gitignore index 8bf4533..79e36ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/procfs-b1afdc2.tar.gz +/procfs-*.tar.gz diff --git a/golang-github-prometheus-procfs.spec b/golang-github-prometheus-procfs.spec index fe51afb..4ad38a7 100644 --- a/golang-github-prometheus-procfs.spec +++ b/golang-github-prometheus-procfs.spec @@ -18,13 +18,6 @@ %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 prometheus @@ -32,12 +25,12 @@ # https://github.com/prometheus/procfs %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit b1afdc266f54247f5dc725544f5d351a8661f502 +%global commit 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: golang-%{provider}-%{project}-%{repo} Version: 0 -Release: 0.10.git%{shortcommit}%{?dist} +Release: 0.11.git%{shortcommit}%{?dist} Summary: Functions to retrieve system, kernel and process metrics from the /proc fs License: ASL 2.0 URL: https://%{provider_prefix} @@ -80,18 +73,6 @@ building other packages which use import path with %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 @@ -159,7 +140,8 @@ gotest %{import_path} %if 0%{?with_devel} %files devel -f devel.file-list -%copying LICENSE +%{!?_licensedir:%global license %%doc} +%license LICENSE %doc README.md CONTRIBUTING.md AUTHORS.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %dir %{gopath}/src/%{import_path} @@ -167,11 +149,16 @@ gotest %{import_path} %if 0%{?with_unit_test} %files unit-test -f unit-test.file-list -%copying LICENSE +%{!?_licensedir:%global license %%doc} +%license LICENSE %doc README.md CONTRIBUTING.md AUTHORS.md %endif %changelog +* Sun Apr 10 2016 Peter Robinson 0-0.10.git406e5b7 +- Bump to upstream 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8 +- Spec cleanups + * Sun Mar 06 2016 jchaloup - 0-0.10.gitb1afdc2 - Bump to upstream b1afdc266f54247f5dc725544f5d351a8661f502 related: #1214778 diff --git a/sources b/sources index 224cde5..ba10556 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -735347eba612a6f4d419f24a0025dadf procfs-b1afdc2.tar.gz +bc911be8f63c751060ea60c08bdc711a procfs-406e5b7.tar.gz