The package rpms/golang-github-spacemonkeygo-openssl.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-spacemonkeygo-opens....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}
ppc64le s390x}
Thanks.
Full change:
============
commit 28a61cc5d4d1bec0d29eebd8726d4e94a9a623d6
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Wed May 29 17:27:16 2019 +0200
Bump to commit c2dcc5cca94ac8f7f3f0c20e20050d4cce9d9730
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index ea6169a..5668e77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/openssl-e863d83.tar.gz
+/openssl-c2dcc5cca94ac8f7f3f0c20e20050d4cce9d9730.tar.gz
diff --git a/golang-github-spacemonkeygo-openssl.spec
b/golang-github-spacemonkeygo-openssl.spec
index a499157..4b8cf41 100644
--- a/golang-github-spacemonkeygo-openssl.spec
+++ b/golang-github-spacemonkeygo-openssl.spec
@@ -1,190 +1,59 @@
-# 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
-%global with_check 1
-# 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
-
-%if ! 0%{?gobuild:1}
-%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od
-An -tx1|tr -d ' \\n')" -a -v -x %{?**};
-%endif
+# Generated by go2rpm
+%bcond_without check
-%global provider github
-%global provider_tld com
-%global project spacemonkeygo
-%global repo openssl
#
https://github.com/spacemonkeygo/openssl
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit e863d83e403e8d694fa7d17f4af3cd176624ef12
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20171219
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.5.%{commitdate}git%{shortcommit}%{?dist}
-Summary: OpenSSL bindings for Go
-# Detected licences
-# - Unknown at 'LICENSE'
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-# Fix failure of tests with golang 1.10
-#
https://github.com/spacemonkeygo/openssl/pull/83
-Patch0: tests-golang-1.10.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 aarch64 %{arm}
ppc64le s390x}
-# 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_bundled}
-# Remaining dependencies not included in main packages
-BuildRequires:
golang(github.com/spacemonkeygo/spacelog)
-%endif
+%global goipath
github.com/spacemonkeygo/openssl
+%global commit c2dcc5cca94ac8f7f3f0c20e20050d4cce9d9730
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
+%gometa
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires:
golang(github.com/spacemonkeygo/spacelog)
-%endif
+%global godevelheader %{expand:
+Requires: openssl-devel}
-Requires:
golang(github.com/spacemonkeygo/spacelog)
+%global common_description %{expand:
+Package Openssl is a light wrapper around OpenSSL for Go.
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/utils) = %{version}-%{release}
+It strives to provide a near-drop-in replacement for the Go standard library tls
+package.}
-%description devel
-%{summary}
+%global golicenses LICENSE
+%global godocs AUTHORS README.md
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+Name: %{goname}
+Version: 0
+Release: 0.6%{?dist}
+Summary: OpenSSL bindings for Go
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-BuildRequires: openssl-devel
-%endif
+# Upstream license specification: Apache-2.0
+License: ASL 2.0
+URL: %{gourl}
+Source0: %{gosource}
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
+BuildRequires:
golang(github.com/spacemonkeygo/spacelog)
+BuildRequires: openssl-devel
-%description unit-test-devel
-%{summary}
+%description
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{commit}
-%patch0 -p1
-
-%build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s ../../../ src/%{import_path}
+%goprep
%install
-install -d -p %{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" -or -iname "*.s" -or -iname
"*.c" -or -iname "*.h" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >>
devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-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
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >>
unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >>
devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%gopkginstall
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-export CGO_CFLAGS=" -I$(pwd)"
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md AUTHORS
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%gocheck
%endif
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md AUTHORS
-%endif
+%gopkgfiles
%changelog
+* Wed May 29 16:42:06 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> -
0-0.6.20190529gitc2dcc5c
+- Bump to commit c2dcc5cca94ac8f7f3f0c20e20050d4cce9d9730
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.5.20171219gite863d83
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
@@ -199,4 +68,3 @@ export CGO_CFLAGS=" -I$(pwd)"
* Mon Jan 15 2018 Marek Skalick <mskalick(a)redhat.com> - 0-0.1.20171219gite863d83
- First package for Fedora
-
diff --git a/sources b/sources
index b8d1b1f..bdc1754 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openssl-e863d83.tar.gz) =
7ad633c2b600a416850eb2a62503c3d5ab4e293b02355458fce7cdc7dbf00225cd12c4eafb3072d82ee68d75e29af6430b55484c2b1ad3a34a71245a4fb593e8
+SHA512 (openssl-c2dcc5cca94ac8f7f3f0c20e20050d4cce9d9730.tar.gz) =
527bf4941f00592cdf69089ed7ffce2c2a04722c36263864127c02cb16f3be2eed047e93815587b8cd8d3a6c0254a2488fe46da8df749eea7d932bf1f0aa1c17
diff --git a/tests-golang-1.10.patch b/tests-golang-1.10.patch
deleted file mode 100644
index b2b4859..0000000
--- a/tests-golang-1.10.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 27042ed400b5f94b86ee8d722e788df6aea66a28 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka(a)redhat.com>
-Date: Mon, 15 Jan 2018 12:04:18 +0100
-Subject: [PATCH] Make test confom to new requirement enforced in go 1.10
-
https://tip.golang.org/doc/go1.10#test. With out this change tests will
- always fails with go 1.10+.
-
----
- key_test.go | 4 ++--
- sha1_test.go | 4 ++--
- sha256_test.go | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/key_test.go b/key_test.go
-index 1bbaf10..3f064df 100644
---- a/key_test.go
-+++ b/key_test.go
-@@ -77,7 +77,7 @@ func TestMarshal(t *testing.T) {
- }
- tls_der := x509.MarshalPKCS1PrivateKey(tls_key)
- if !bytes.Equal(der, tls_der) {
-- t.Fatal("invalid private key der bytes: %s\n v.s. %s\n",
-+ t.Fatalf("invalid private key der bytes: %s\n v.s. %s\n",
- hex.Dump(der), hex.Dump(tls_der))
- }
-
-@@ -291,7 +291,7 @@ func TestMarshalEC(t *testing.T) {
- t.Fatal(err)
- }
- if !bytes.Equal(der, tls_der) {
-- t.Fatal("invalid private key der bytes: %s\n v.s. %s\n",
-+ t.Fatalf("invalid private key der bytes: %s\n v.s. %s\n",
- hex.Dump(der), hex.Dump(tls_der))
- }
-
-diff --git a/sha1_test.go b/sha1_test.go
-index 2c25978..37808b5 100644
---- a/sha1_test.go
-+++ b/sha1_test.go
-@@ -35,7 +35,7 @@ func TestSHA1(t *testing.T) {
- }
-
- if expected != got {
-- t.Fatal("exp:%x got:%x", expected, got)
-+ t.Fatalf("exp:%x got:%x", expected, got)
- }
- }
- }
-@@ -73,7 +73,7 @@ func TestSHA1Writer(t *testing.T) {
- }
-
- if got != exp {
-- t.Fatal("exp:%x got:%x", exp, got)
-+ t.Fatalf("exp:%x got:%x", exp, got)
- }
- }
- }
-diff --git a/sha256_test.go b/sha256_test.go
-index b4e7af8..467e503 100644
---- a/sha256_test.go
-+++ b/sha256_test.go
-@@ -35,7 +35,7 @@ func TestSHA256(t *testing.T) {
- }
-
- if expected != got {
-- t.Fatal("exp:%x got:%x", expected, got)
-+ t.Fatalf("exp:%x got:%x", expected, got)
- }
- }
- }
-@@ -73,7 +73,7 @@ func TestSHA256Writer(t *testing.T) {
- }
-
- if got != exp {
-- t.Fatal("exp:%x got:%x", exp, got)
-+ t.Fatalf("exp:%x got:%x", exp, got)
- }
- }
- }