The package rpms/golang-github-prometheus-common.git has added or updated architecture
specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-prometheus-common.g....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit d436818d8c6a6056f64049e9dde61a1141a3e010
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Jun 26 12:25:21 2018 +0200
Upload glide files
diff --git a/.gitignore b/.gitignore
index a43e7c0..03d32d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/common-49fee29.tar.gz
+/common-49fee292b27bfff7f354ee0f64e1bc4850462edf.tar.gz
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..c9a14cd
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,37 @@
+hash: 23190e72700b113ee82e9ce34b2e2ba879f98d760555b070d50c44f9a9e45290
+imports:
+- name:
github.com/prometheus/procfs
+ subpackages:
+ - xfs
+ - ''
+ version: 8f918ac9ab4be3a790338bda8624fec5d71260b3
+- name:
github.com/golang/protobuf
+ subpackages:
+ - proto
+ version: 9c8fb7a95075eb047ab75e702de52f68ff360f17
+- name:
github.com/prometheus/client_model
+ subpackages:
+ - go
+ version: 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
+- name:
golang.org/x/net
+ subpackages:
+ - context
+ version: b68f30494add4df6bd8ef5e82803f308e7f7c59c
+- name:
github.com/matttproud/golang_protobuf_extensions
+ subpackages:
+ - pbutil
+ version: c12348ce28de40eed0136aa2b644d0ee0650e56c
+- name:
github.com/beorn7/perks
+ subpackages:
+ - quantile
+ version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
+- name:
github.com/prometheus/client_golang
+ subpackages:
+ - prometheus
+ version: 6ab3432d241cbe3cb7543da7e7e9a934c7e9fe76
+- name:
github.com/julienschmidt/httprouter
+ version: 8a45e95fc75cb77048068a62daed98cc22fdac7c
+- name:
github.com/Sirupsen/logrus
+ version: 9fd28e6ccafc44cb1d38cf3059d0c79d3f33cb66
+updated: '2018-06-26T09:51:21.718373+00:00'
+
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..c589139
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,36 @@
+import:
+- package:
github.com/prometheus/procfs
+ subpackages:
+ - xfs
+ - ''
+ version: 8f918ac9ab4be3a790338bda8624fec5d71260b3
+- package:
github.com/golang/protobuf
+ subpackages:
+ - proto
+ version: 9c8fb7a95075eb047ab75e702de52f68ff360f17
+- package:
github.com/prometheus/client_model
+ subpackages:
+ - go
+ version: 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
+- package:
golang.org/x/net
+ subpackages:
+ - context
+ version: b68f30494add4df6bd8ef5e82803f308e7f7c59c
+- package:
github.com/matttproud/golang_protobuf_extensions
+ subpackages:
+ - pbutil
+ version: c12348ce28de40eed0136aa2b644d0ee0650e56c
+- package:
github.com/beorn7/perks
+ subpackages:
+ - quantile
+ version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
+- package:
github.com/prometheus/client_golang
+ subpackages:
+ - prometheus
+ version: 6ab3432d241cbe3cb7543da7e7e9a934c7e9fe76
+- package:
github.com/julienschmidt/httprouter
+ version: 8a45e95fc75cb77048068a62daed98cc22fdac7c
+- package:
github.com/Sirupsen/logrus
+ version: 9fd28e6ccafc44cb1d38cf3059d0c79d3f33cb66
+package:
github.com/prometheus/common
+
diff --git a/golang-github-prometheus-common.spec b/golang-github-prometheus-common.spec
index 05329ef..a81b04c 100644
--- a/golang-github-prometheus-common.spec
+++ b/golang-github-prometheus-common.spec
@@ -1,68 +1,30 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0
condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply
a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-# Cyclic deps on client again
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project prometheus
-%global repo common
-#
https://github.com/prometheus/common
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+#
http://github.com/prometheus/common
+
+%global goipath
github.com/prometheus/common
%global commit 49fee292b27bfff7f354ee0f64e1bc4850462edf
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
+
+%gometa -i
+
+Name: %{goname}
Version: 0
-Release: 0.12.git%{shortcommit}%{?dist}
+Release: 0.13%{?dist}
Summary: Go libraries shared across Prometheus components and libraries
License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+URL: %{gourl}
+Source0: %{gosource}
+Source1: glide.yaml
+Source2: glide.yaml
Patch0: change-import-path.patch
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+Patch1: Fix-formatting-errors.patch
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
BuildRequires:
golang(github.com/Sirupsen/logrus)
BuildRequires:
golang(github.com/golang/protobuf/proto)
BuildRequires:
golang(github.com/julienschmidt/httprouter)
@@ -71,125 +33,38 @@ BuildRequires:
golang(github.com/prometheus/client_golang/prometheus)
BuildRequires:
golang(github.com/prometheus/client_model/go)
BuildRequires:
golang(golang.org/x/net/context)
BuildRequires:
golang(bitbucket.org/ww/goautoneg)
-%endif
-
-Requires:
golang(github.com/Sirupsen/logrus)
-Requires:
golang(github.com/golang/protobuf/proto)
-Requires:
golang(github.com/julienschmidt/httprouter)
-Requires:
golang(github.com/matttproud/golang_protobuf_extensions/pbutil)
-Requires:
golang(github.com/prometheus/client_golang/prometheus)
-Requires:
golang(github.com/prometheus/client_model/go)
-Requires:
golang(golang.org/x/net/context)
-Requires:
golang(bitbucket.org/ww/goautoneg)
-
-Provides: golang(%{import_path}/config) = %{version}-%{release}
-Provides: golang(%{import_path}/expfmt) = %{version}-%{release}
-Provides: golang(%{import_path}/log) = %{version}-%{release}
-Provides: golang(%{import_path}/model) = %{version}-%{release}
-Provides: golang(%{import_path}/route) = %{version}-%{release}
-Provides: golang(%{import_path}/version) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%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-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup -q
+cp %{SOURCE1} %{SOURCE2} .
%patch0 -p1
-
-%build
+%patch1 -p1
%install
-rm -f log/eventlog_formatter.go
-
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >>
devel.file-list
- 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} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >>
devel.file-list
- 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-devel.file-list
-done
-cp -r expfmt/testdata %{buildroot}/%{gopath}/src/%{import_path}/expfmt/.
-echo "%%{gopath}/src/%%{import_path}/./expfmt/testdata" >>
unit-test-devel.file-list
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall glide.lock glide.yaml
+#rm -f log/eventlog_formatter.go
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}/expfmt
-#%%gotest %%{import_path}/log
-%gotest %{import_path}/model
-%gotest %{import_path}/route
-%endif
+%gochecks -d config -d log
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc *.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc *.md
-%endif
%changelog
+* Tue Jun 26 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.13.git49fee29
+- Upload glide files
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.12.git49fee29
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 84fe4a3..9123bf9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (common-49fee29.tar.gz) =
5d01ad668eb6a15494fa207e85da558f7f8f1dbc89866db7d0c400ace81fc87b16a7cd105d167c2bd06150c33a356f5fe46d4cadd05d6dd2b3fac1e3c3b988ef
+SHA512 (common-49fee292b27bfff7f354ee0f64e1bc4850462edf.tar.gz) =
5d01ad668eb6a15494fa207e85da558f7f8f1dbc89866db7d0c400ace81fc87b16a7cd105d167c2bd06150c33a356f5fe46d4cadd05d6dd2b3fac1e3c3b988ef
commit bb15b7b6a9bcb0750b8bd269fb3cc8b387354117
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:48:19 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/golang-github-prometheus-common.spec b/golang-github-prometheus-common.spec
index 240bef5..05329ef 100644
--- a/golang-github-prometheus-common.spec
+++ b/golang-github-prometheus-common.spec
@@ -42,7 +42,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.11.git%{shortcommit}%{?dist}
+Release: 0.12.git%{shortcommit}%{?dist}
Summary: Go libraries shared across Prometheus components and libraries
License: ASL 2.0
URL: https://%{provider_prefix}
@@ -190,6 +190,9 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.12.git49fee29
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Fri Sep 22 2017 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.11.git49fee29
- add missing dependency
related: #1315096