From 347555f4f6ea2d70855d07a328de03df65148724 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 20 Mar 2021 15:44:34 +0000 Subject: [PATCH 1/4] rpm: run make check in %check area --- packaging/redhat/zeromq.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/redhat/zeromq.spec b/packaging/redhat/zeromq.spec index 67963c0e..56072187 100644 --- a/packaging/redhat/zeromq.spec +++ b/packaging/redhat/zeromq.spec @@ -228,11 +228,12 @@ autoreconf -fi %{__make} %{?_smp_mflags} +%check +%{__make} check VERBOSE=1 + %install [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} - # Install the package to build area -%{__make} check VERBOSE=1 %makeinstall %post From 5a139a556a7b7045bfca8c350f6557e53a5ebcd9 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 20 Mar 2021 15:45:27 +0000 Subject: [PATCH 2/4] rpm: fix Group metadata --- packaging/redhat/zeromq.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/redhat/zeromq.spec b/packaging/redhat/zeromq.spec index 56072187..e4193600 100644 --- a/packaging/redhat/zeromq.spec +++ b/packaging/redhat/zeromq.spec @@ -13,7 +13,7 @@ Name: zeromq Version: 4.3.5 Release: 1%{?dist} Summary: The ZeroMQ messaging library -Group: Applications/Internet +Group: Development/Libraries/C and C++ License: LGPLv3+ URL: http://www.zeromq.org/ Source: http://download.zeromq.org/%{name}-%{version}.tar.gz From 02be28e86b2d7b7b763f4e14c7f75dae72097dd0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 20 Mar 2021 15:49:48 +0000 Subject: [PATCH 3/4] rpm: fix license shortname --- packaging/redhat/zeromq.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/redhat/zeromq.spec b/packaging/redhat/zeromq.spec index e4193600..d9375ac6 100644 --- a/packaging/redhat/zeromq.spec +++ b/packaging/redhat/zeromq.spec @@ -14,7 +14,7 @@ Version: 4.3.5 Release: 1%{?dist} Summary: The ZeroMQ messaging library Group: Development/Libraries/C and C++ -License: LGPLv3+ +License: LGPL-3.0-or-later URL: http://www.zeromq.org/ Source: http://download.zeromq.org/%{name}-%{version}.tar.gz Prefix: %{_prefix} From b82777bfb68b5208340332c85cc8df8359e658fa Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 20 Mar 2021 16:02:12 +0000 Subject: [PATCH 4/4] Problem: compiler error with GCC 11 Solution: downcast size to uint32_t to match vector size range --- src/radix_tree.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/radix_tree.cpp b/src/radix_tree.cpp index 04374eec..2a38ebf0 100644 --- a/src/radix_tree.cpp +++ b/src/radix_tree.cpp @@ -558,7 +558,7 @@ visit_keys (node_t node_, for (size_t i = 0, edgecount = node_.edgecount (); i < edgecount; ++i) { visit_keys (node_.node_at (i), buffer_, func_, arg_); } - buffer_.resize (buffer_.size () - prefix_length); + buffer_.resize (static_cast (buffer_.size () - prefix_length)); } void zmq::radix_tree_t::apply (