The package rpms/golang-github-ema-qdisc.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-ema-qdisc.git/commi....
Change:
+%ifnarch s390x
Thanks.
Full change:
============
commit 56a91c8b07d49e0e0f2754eb423afbe47fff38a8
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Thu May 23 20:01:46 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/0001-Update-library-for-current-netlink.patch
b/0001-Update-library-for-current-netlink.patch
new file mode 100644
index 0000000..eb104a5
--- /dev/null
+++ b/0001-Update-library-for-current-netlink.patch
@@ -0,0 +1,71 @@
+From ff92d56893bb7c404507acf9ab65b9e9af015e2a Mon Sep 17 00:00:00 2001
+From: Ben Kochie <superq(a)gmail.com>
+Date: Wed, 3 Apr 2019 14:28:06 +0200
+Subject: [PATCH] Update library for current netlink
+
+Update the library to be compatible with the latest netlink library
+master.
+---
+ get.go | 2 +-
+ get_test.go | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/get.go b/get.go
+index b0e8430..13325fb 100644
+--- a/get.go
++++ b/get.go
+@@ -157,7 +157,7 @@ func parseTC_Fq_Qd_Stats(attr netlink.Attribute) (TC_Fq_Qd_Stats,
error) {
+ func getQdiscMsgs(c *netlink.Conn) ([]netlink.Message, error) {
+ req := netlink.Message{
+ Header: netlink.Header{
+- Flags: netlink.HeaderFlagsRequest | netlink.HeaderFlagsDump,
++ Flags: netlink.Request | netlink.Dump,
+ Type: 38, // RTM_GETQDISC
+ },
+ Data: []byte{0},
+diff --git a/get_test.go b/get_test.go
+index f895f63..0a1751b 100644
+--- a/get_test.go
++++ b/get_test.go
+@@ -9,7 +9,7 @@ import (
+ )
+
+ func TestGetAndParseFail(t *testing.T) {
+- c := nltest.Dial(func(req netlink.Message) ([]netlink.Message, error) {
++ c := nltest.Dial(func(req []netlink.Message) ([]netlink.Message, error) {
+ return nltest.Error(int(syscall.ENOENT), req)
+ })
+
+@@ -26,8 +26,8 @@ func TestGetAndParseFail(t *testing.T) {
+ func TestGetAndParseShort(t *testing.T) {
+ msg := netlink.Message{Data: []byte{0xff, 0xff, 0xff, 0xff}}
+
+- c := nltest.Dial(func(req netlink.Message) ([]netlink.Message, error) {
+- msg.Header.Sequence = req.Header.Sequence
++ c := nltest.Dial(func(req []netlink.Message) ([]netlink.Message, error) {
++ msg.Header.Sequence = req[0].Header.Sequence
+ return []netlink.Message{msg}, nil
+ })
+
+@@ -44,8 +44,8 @@ func TestGetAndParseShort(t *testing.T) {
+ func TestGetAndParseUnmarshal(t *testing.T) {
+ msg := netlink.Message{Data: []byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}
+
+- c := nltest.Dial(func(req netlink.Message) ([]netlink.Message, error) {
+- msg.Header.Sequence = req.Header.Sequence
++ c := nltest.Dial(func(req []netlink.Message) ([]netlink.Message, error) {
++ msg.Header.Sequence = req[0].Header.Sequence
+ return []netlink.Message{msg}, nil
+ })
+
+@@ -63,8 +63,8 @@ func TestGetAndParseOK(t *testing.T) {
+ d := []byte{0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 128, 255, 255, 255, 255, 2, 0, 0, 0, 7, 0,
1, 0, 102, 113, 0, 0, 84, 0, 2, 0, 8, 0, 1, 0, 16, 39, 0, 0, 8, 0, 2, 0, 100, 0, 0, 0, 8,
0, 3, 0, 212, 11, 0, 0, 8, 0, 4, 0, 36, 59, 0, 0, 8, 0, 5, 0, 1, 0, 0, 0, 8, 0, 7, 0, 255,
255, 255, 255, 8, 0, 9, 0, 64, 156, 0, 0, 8, 0, 10, 0, 255, 3, 0, 0, 8, 0, 11, 0, 142, 12,
1, 0, 8, 0, 8, 0, 10, 0, 0, 0, 132, 0, 7, 0, 84, 0, 4, 0, 125, 97, 0, 0, 0, 0, 0, 0, 86,
82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 203, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 114, 61, 37, 209, 53, 184, 251,
255, 255, 7, 0, 0, 255, 7, 0, 0, 0, 0, 0, 0, 227, 183, 1, 0, 20, 0, 1, 0, 139, 42, 111,
15, 0, 0, 0, 0, 159, 76, 30, 0, 0, 0, 0, 0, 24, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 22, 0, 0, 0, 0, 0, 0, 0, 44, 0, 3, 0, 139, 42, 111, 15, 0, 0, 0, 0, 159, 76, 30, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 0, 4,
0, 125, 97, 0, 0, 0, 0, 0, 0, 86, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 203, 52,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
114, 61, 37, 209, 53, 184, 251, 255, 255, 7, 0, 0, 255, 7, 0, 0, 0, 0, 0, 0, 227, 183, 1,
0}
+ msg := netlink.Message{Data: d}
+
+- c := nltest.Dial(func(req netlink.Message) ([]netlink.Message, error) {
+- msg.Header.Sequence = req.Header.Sequence
++ c := nltest.Dial(func(req []netlink.Message) ([]netlink.Message, error) {
++ msg.Header.Sequence = req[0].Header.Sequence
+ return []netlink.Message{msg}, nil
+ })
+
diff --git a/golang-github-ema-qdisc.spec b/golang-github-ema-qdisc.spec
index 52d2a9b..7353e9c 100644
--- a/golang-github-ema-qdisc.spec
+++ b/golang-github-ema-qdisc.spec
@@ -1,61 +1,69 @@
+# Generated by go2rpm
+# Tests fail on s390x possibly due to endianess, for more info
+# See:
https://github.com/mdlayher/netlink/issues/77
+%ifnarch s390x
%bcond_without check
-%global goipath
github.com/ema/qdisc
-%global commit b307c22d3ce761d351b6e6270b50195b44ee9248
-Version: 0
+%endif
+
+#
https://github.com/ema/qdisc
+%global goipath
github.com/ema/qdisc
+%global commit b307c22d3ce761d351b6e6270b50195b44ee9248
+
+%gometa
%global common_description %{expand:
Package qdisc allows to get queuing discipline information via netlink,
-similar to what tc (from iproute2) does.}
+similarly to what tc (from iproute2) does.}
-%gometa
+%global golicenses LICENSE.md
+%global godocs README.md
-Name: %{goname}
-Release: 0.4%{?dist}
-Summary: qdisc allows to get queuing discipline information via netlink
-License: MIT
-URL: %{gourl}
-Source: %{gosource}
+Name: %{goname}
+Version: 0
+Release: 0.1%{?dist}
+Summary: Get queuing discipline information via netlink
-BuildRequires:
golang(github.com/mdlayher/netlink)
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
+# Update library for current netlink
+Patch0:
https://patch-diff.githubusercontent.com/raw/ema/qdisc/pull/3.patch#/0001...
-%description
-%{common_description}
+BuildRequires:
golang(github.com/mdlayher/netlink)
+BuildRequires:
golang(github.com/mdlayher/netlink/nlenc)
-%package devel
-Summary: %{summary}
+%if %{with check}
+# Tests
+BuildRequires:
golang(github.com/mdlayher/netlink/nltest)
+%endif
-%description devel
+%description
%{common_description}
-This package contains the source code needed for building packages that import
-the %{goipath} Go namespace.
+%gopkg
%prep
-%forgesetup
-rm -rf vendor
+%goprep
+%patch0 -p1
%install
-%goinstall
+%gopkginstall
-%check
%if %{with check}
- # Tests fail on s390x possibly due to endianess, for more info
- # See:
https://github.com/mdlayher/netlink/issues/77
- %ifnarch s390x
- %gochecks
- %endif
+%check
+%gocheck
%endif
-%files devel -f devel.file-list
-%license LICENSE.md
-%doc *\.md
+%gopkgfiles
%changelog
+* Thu May 23 19:41:53 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> -
0-0.5.20180508gitb307c22
+- Update to new macros
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.4.gitb307c22
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-* Tue Oct 23 2018 Nicolas Mailhot <nim(a)fedoraproject.org>
-- 0-0.3
+* Tue Oct 23 2018 Nicolas Mailhot <nim(a)fedoraproject.org> - 0-0.3.gitb307c22
- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as its
just an alias
-
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
@@ -64,4 +72,3 @@ rm -rf vendor
* Tue May 08 2018 Paul Gier <pgier(a)redhat.com> - 0-0.1.20180508gitb307c22
- First package for Fedora
-