The package rpms/golang-github-appc-spec.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-appc-spec.git/commi....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit e907dc60a3f1724dca1d0bd222b36b67b3a29124
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Jun 8 15:51:59 2018 +0200
Bump to 0.8.11
diff --git a/.gitignore b/.gitignore
index 5d22757..72d5349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/spec-37bef679148751952f169298fa0ea8171373d95c.tar.gz
+/spec-0.8.11.tar.gz
diff --git a/Remove-tests-with-non-existing-pflag.Value.Type-meth.patch
b/Remove-tests-with-non-existing-pflag.Value.Type-meth.patch
new file mode 100644
index 0000000..b930554
--- /dev/null
+++ b/Remove-tests-with-non-existing-pflag.Value.Type-meth.patch
@@ -0,0 +1,38 @@
+From f45bf90f1b63dc21ef3af62ee48d6f055f08a303 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup(a)redhat.com>
+Date: Fri, 8 Jun 2018 16:53:55 +0200
+Subject: [PATCH] Remove tests with non-existing pflag.Value.Type() method
+
+---
+ schema/types/resource/quantity_test.go | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/schema/types/resource/quantity_test.go
b/schema/types/resource/quantity_test.go
+index 5f2e7be..96cc84a 100644
+--- a/schema/types/resource/quantity_test.go
++++ b/schema/types/resource/quantity_test.go
+@@ -24,7 +24,6 @@ import (
+ "unicode"
+
+ fuzz "github.com/google/gofuzz"
+- "github.com/spf13/pflag"
+
+ inf "gopkg.in/inf.v0"
+ )
+@@ -1033,13 +1032,6 @@ func TestQFlagSet(t *testing.T) {
+ }
+ }
+
+-func TestQFlagIsPFlag(t *testing.T) {
+- var pfv pflag.Value = qFlag{}
+- if e, a := "quantity", pfv.Type(); e != a {
+- t.Errorf("Unexpected result %v != %v", e, a)
+- }
+-}
+-
+ func TestSub(t *testing.T) {
+ tests := []struct {
+ a Quantity
+--
+2.7.5
+
diff --git a/golang-github-appc-spec.spec b/golang-github-appc-spec.spec
index 12e4e91..30c38eb 100644
--- a/golang-github-appc-spec.spec
+++ b/golang-github-appc-spec.spec
@@ -1,17 +1,19 @@
#
https://github.com/appc/spec
%global goipath
github.com/appc/spec
-%global commit 37bef679148751952f169298fa0ea8171373d95c
+%global gcommit cbe99b7160b1397bf89f9c8bb1418f69c9424049
#%%global __requires_exclude
github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource
+Version: 0.8.11
+
%gometa -i
Name: %{goname}
-Version: 0.5.1
-Release: 13.git%{?dist}
+Release: 1%{?dist}
Summary: Schema defs and tools for app container specification
License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
+Patch0: Remove-tests-with-non-existing-pflag.Value.Type-meth.patch
Provides: actool = %{version}-%{release}
Provides: ace-validator = %{version}-%{release}
@@ -23,10 +25,8 @@ Provides: ace-validator = %{version}-%{release}
Summary: %{summary}
BuildArch: noarch
-#Requires:
golang(github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource)
-Requires:
golang(github.com/coreos/go-semver/semver) >= 0-0.2
-Requires:
golang(golang.org/x/net/html)
-Requires:
golang(golang.org/x/net/html/atom)
+# test deps
+BuildRequires:
golang(github.com/google/gofuzz)
%description devel
%{summary}
@@ -37,6 +37,7 @@ building other packages which use import path with
%prep
%gosetup -q
+%patch0 -p1
%build
%gobuildroot
@@ -55,17 +56,12 @@ install -p -m 755 _bin/ace-validator %{buildroot}%{_bindir}
%goinstall ./discovery discovery/myapp.html discovery/myapp2.html
-mkdir -p
_build/src/github.com/GoogleCloudPlatform
-ln -s $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes
_build/src/github.com/GoogleCloudPlatform/kubernetes
-mkdir -p
_build/src/speter.net/go/exp/math/dec
-ln -s $(pwd)/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf
_build/src/speter.net/go/exp/math/dec/inf
-
%check
%gochecks
%files
%license LICENSE
-%doc SPEC.md README.md OS-SPEC.md GUIDE.md CONTRIBUTING.md
+%doc *.md README.md
%{_bindir}/actool
%{_bindir}/ace-validator
@@ -73,6 +69,9 @@ ln -s $(pwd)/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf
_build/src/spe
%license LICENSE
%changelog
+* Fri Jun 08 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0.8.11-1
+ Bump to 0.8.11
+
* Fri Jun 08 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0.5.1-13.git.git37bef67
- Update to spec 3.0
diff --git a/sources b/sources
index 825d8d2..634da5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (spec-37bef679148751952f169298fa0ea8171373d95c.tar.gz) =
605110d869653c4309559cc6c74ed3fa0172b43a8525f2513047af3649c5dd97909d2116aea5cd9b21a48cd2a211d44ec2c670bdbf79ba4546258177d74d5029
+SHA512 (spec-0.8.11.tar.gz) =
f2cd6ce728a50a0b32396a7c92e32dc570719e49e714b51b190cabe6d917432aec010af92c4e7d26e5a9106ef47976c74b0469411ecca443366d70d0d06dd84b
commit ec2c0a3b904f6d1445d580db06935def3c950e89
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Fri Jun 8 15:24:23 2018 +0200
Update to spec 3.0
diff --git a/.gitignore b/.gitignore
index 6b51328..5d22757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/spec-202fd7b.tar.gz
-/spec-2fee340.tar.gz
-/spec-fa6d3af.tar.gz
-/spec-c8559a2.tar.gz
-/spec-37bef67.tar.gz
+/spec-37bef679148751952f169298fa0ea8171373d95c.tar.gz
diff --git a/golang-github-appc-spec.spec b/golang-github-appc-spec.spec
index 63c0c00..12e4e91 100644
--- a/golang-github-appc-spec.spec
+++ b/golang-github-appc-spec.spec
@@ -1,52 +1,17 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-# package depends on kubernetes which atm does
-# not provide complete source codes
-%global with_bundled 1
-%if 0%{?rhel} == 6
-%global with_debug 0
-%else
-%global with_debug 1
-%endif
-# missing deps on kubernetes
-%global with_check 0
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 1
-%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
-
-%global provider github
-%global provider_tld com
-%global project appc
-%global repo spec
#
https://github.com/appc/spec
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global goipath
github.com/appc/spec
%global commit 37bef679148751952f169298fa0ea8171373d95c
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+#%%global __requires_exclude
github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource
-Name: golang-%{provider}-%{project}-%{repo}
+%gometa -i
+
+Name: %{goname}
Version: 0.5.1
-Release: 12.git%{shortcommit}%{?dist}
+Release: 13.git%{?dist}
Summary: Schema defs and tools for app container specification
License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# 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}
+URL: %{gourl}
+Source0: %{gosource}
Provides: actool = %{version}-%{release}
Provides: ace-validator = %{version}-%{release}
@@ -54,80 +19,30 @@ Provides: ace-validator = %{version}-%{release}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-#BuildRequires:
golang(github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource)
-BuildRequires:
golang(github.com/coreos/go-semver/semver) >= 0-0.2
-BuildRequires:
golang(golang.org/x/net/html)
-BuildRequires:
golang(golang.org/x/net/html/atom)
-%endif
-
#Requires:
golang(github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource)
Requires:
golang(github.com/coreos/go-semver/semver) >= 0-0.2
Requires:
golang(golang.org/x/net/html)
Requires:
golang(golang.org/x/net/html/atom)
-Provides: golang(%{import_path}/aci) = %{version}-%{release}
-Provides: golang(%{import_path}/discovery) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/acirenderer) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/tarheader) = %{version}-%{release}
-Provides: golang(%{import_path}/schema) = %{version}-%{release}
-Provides: golang(%{import_path}/schema/types) = %{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
-Summary: Unit tests for %{name} package
-# 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}
-
-%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
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup -q
%build
-mkdir -p
src/github.com/appc
-ln -s ../../../
src/github.com/appc/spec
+%gobuildroot
-%if 0%{?with_bundled}
-export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath}
-%else
-export GOPATH=$(pwd):%{gopath}
-%endif
-
-%if 0%{?with_debug}
-function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An
-tx1|tr -d ' \n')" -v -x "$@"; }
-%else
-function gobuild { go build -a "$@"; }
-%endif
-
-gobuild -o bin/actool %{import_path}/actool
-gobuild -o bin/ace-validator -installsuffix ace %{import_path}/ace
+%gobuild -o _bin/actool %{goipath}/actool
+%gobuild -o _bin/ace-validator %{goipath}/ace
find . -name "*.go" \
-print |\
@@ -135,66 +50,18 @@ find . -name "*.go" \
%install
install -d -p %{buildroot}%{_bindir}
-install -p -m 755 bin/actool %{buildroot}%{_bindir}
-install -p -m 755 bin/ace-validator %{buildroot}%{_bindir}
-
-# 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" | grep -v
"^./Godeps") ; 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}/
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/discovery
-echo "%%dir %%{gopath}/src/%%{import_path}/./discovery" >>
devel.file-list
-cp -pav discovery/myapp.html %{buildroot}/%{gopath}/src/%{import_path}/discovery/.
-cp -pav discovery/myapp2.html %{buildroot}/%{gopath}/src/%{import_path}/discovery/.
-echo "%%{gopath}/src/%%{import_path}/discovery/myapp.html" >>
unit-test.file-list
-echo "%%{gopath}/src/%%{import_path}/discovery/myapp2.html" >>
unit-test.file-list
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go" | grep -v "^./Godeps"); 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.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+install -p -m 755 _bin/actool %{buildroot}%{_bindir}
+install -p -m 755 _bin/ace-validator %{buildroot}%{_bindir}
+
+%goinstall ./discovery discovery/myapp.html discovery/myapp2.html
+
+mkdir -p
_build/src/github.com/GoogleCloudPlatform
+ln -s $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes
_build/src/github.com/GoogleCloudPlatform/kubernetes
+mkdir -p
_build/src/speter.net/go/exp/math/dec
+ln -s $(pwd)/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf
_build/src/speter.net/go/exp/math/dec/inf
%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}/aci
-%gotest %{import_path}/discovery
-%gotest %{import_path}/pkg/acirenderer
-%gotest %{import_path}/pkg/tarheader
-%gotest %{import_path}/schema
-%gotest %{import_path}/schema/types
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
+%gochecks
%files
%license LICENSE
@@ -202,20 +69,13 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%{_bindir}/actool
%{_bindir}/ace-validator
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
-%doc SPEC.md README.md OS-SPEC.md GUIDE.md CONTRIBUTING.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc SPEC.md README.md OS-SPEC.md GUIDE.md CONTRIBUTING.md
-%endif
%changelog
+* Fri Jun 08 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0.5.1-13.git.git37bef67
+- Update to spec 3.0
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.5.1-12.git37bef67
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 6152444..825d8d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99e35347375af0354c7baea81d0d8177 spec-37bef67.tar.gz
+SHA512 (spec-37bef679148751952f169298fa0ea8171373d95c.tar.gz) =
605110d869653c4309559cc6c74ed3fa0172b43a8525f2513047af3649c5dd97909d2116aea5cd9b21a48cd2a211d44ec2c670bdbf79ba4546258177d74d5029
commit fb226add87278e85bf35cd63cab900728eec43f4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 13:57:22 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-appc-spec.spec b/golang-github-appc-spec.spec
index b22699d..63c0c00 100644
--- a/golang-github-appc-spec.spec
+++ b/golang-github-appc-spec.spec
@@ -37,7 +37,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0.5.1
-Release: 11.git%{shortcommit}%{?dist}
+Release: 12.git%{shortcommit}%{?dist}
Summary: Schema defs and tools for app container specification
License: ASL 2.0
URL: https://%{provider_prefix}
@@ -216,6 +216,9 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.5.1-12.git37bef67
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.5.1-11.git37bef67
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild