The package rpms/fbzmq.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/fbzmq.git/commit/?id=02b7006458b21cb....
Change: -%ifarch i686 x86_64
Thanks.
Full change: ============
commit 02b7006458b21cb6b8a12bccd77611927d1d7e11 Author: Michel Alexandre Salim salimma@fedoraproject.org Date: Mon Feb 28 12:31:52 2022 -0800
Update to 2022.02.21.00; drop static build
Signed-off-by: Michel Alexandre Salim salimma@fedoraproject.org
diff --git a/fbzmq-no_monitor_test.patch b/fbzmq-no_monitor_test.patch deleted file mode 100644 index 3f14703..0000000 --- a/fbzmq-no_monitor_test.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 970fcdea3861f8d7d092176b8b00f5ce0f0ebc51 Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim michel@michel-slm.name -Date: Tue, 22 Dec 2020 21:09:08 -0800 -Subject: [PATCH] Disable ZmqMonitorTest - -Does not currently compile: - -``` -In file included from /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h:33, - from /usr/include/c++/11/bits/allocator.h:46, - from /usr/include/c++/11/string:41, - from /usr/include/c++/11/bits/locale_classes.h:40, - from /usr/include/c++/11/bits/ios_base.h:41, - from /usr/include/c++/11/ios:42, - from /usr/include/c++/11/ostream:38, - from /usr/include/glog/logging.h:43, - from /builddir/build/BUILD/fbzmq-2020.12.21.00/fbzmq/service/monitor/tests/ZmqMonitorTest.cpp:8: -In member function '__gnu_cxx::new_allocator<char>::deallocate(char*, unsigned long)', - inlined from 'std::allocator_traits<std::allocator<char> >::deallocate(std::allocator<char>&, char*, unsigned long)' at /usr/include/c++/11/bits/alloc_traits.h:492:23, - inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_destroy(unsigned long)' at /usr/include/c++/11/bits/basic_string.h:237:34, - inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_dispose()' at /usr/include/c++/11/bits/basic_string.h:232:14, - inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::~basic_string()' at /usr/include/c++/11/bits/basic_string.h:658:19, - inlined from 'fbzmq::Error::~Error()' at /builddir/build/BUILD/fbzmq-2020.12.21.00/fbzmq/zmq/Common.h:26:8, - inlined from 'folly::expected_detail::ExpectedStorage<fbzmq::thrift::CounterValuesResponse, fbzmq::Error, (folly::expected_detail::StorageType)2>::clear()' at /usr/include/folly/Expected.h:378:29, - inlined from 'folly::expected_detail::ExpectedStorage<fbzmq::thrift::CounterValuesResponse, fbzmq::Error, (folly::expected_detail::StorageType)2>::~ExpectedStorage()' at /usr/include/folly/Expected.h:371:29, - inlined from 'folly::Expected<fbzmq::thrift::CounterValuesResponse, fbzmq::Error>::~Expected()' at /usr/include/folly/Expected.h:806:7, - inlined from 'ZmqMonitorTest_BasicOperation_Test::TestBody()' at /builddir/build/BUILD/fbzmq-2020.12.21.00/fbzmq/service/monitor/tests/ZmqMonitorTest.cpp:199:58: -/usr/include/c++/11/ext/new_allocator.h:139:26: error: 'operator delete(void*, unsigned long)' called on a pointer to an unallocated object '1B' [-Werror=free-nonheap-object] - 139 | ::operator delete(__p - | ~~~~~~~~~~~~~~~~~^~~~ - 140 | #if __cpp_sized_deallocation - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 141 | , __t * sizeof(_Tp) - | ~~~~~~~~~~~~~~~~~~~ - 142 | #endif - | ~~~~~~ - 143 | ); - | -``` - -Signed-off-by: Michel Alexandre Salim michel@michel-slm.name ---- - fbzmq/CMakeLists.txt | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/fbzmq/CMakeLists.txt b/fbzmq/CMakeLists.txt -index c534564e..2d4e3df9 100644 ---- a/fbzmq/CMakeLists.txt -+++ b/fbzmq/CMakeLists.txt -@@ -212,9 +212,9 @@ if (BUILD_TESTS) - add_executable(thread_data_test - service/stats/tests/ThreadDataTest.cpp - ) -- add_executable(zmq_monitor_test -- service/monitor/tests/ZmqMonitorTest.cpp -- ) -+ # add_executable(zmq_monitor_test -+ # service/monitor/tests/ZmqMonitorTest.cpp -+ # ) - add_executable(zmq_monitor_client_test - service/monitor/tests/ZmqMonitorClientTest.cpp - ) -@@ -292,11 +292,11 @@ if (BUILD_TESTS) - GTest::GTest - GTest::Main - ) -- target_link_libraries(zmq_monitor_test -- fbzmq -- GTest::GTest -- GTest::Main -- ) -+ # target_link_libraries(zmq_monitor_test -+ # fbzmq -+ # GTest::GTest -+ # GTest::Main -+ # ) - target_link_libraries(zmq_monitor_client_test - fbzmq - GTest::GTest -@@ -330,7 +330,7 @@ if (BUILD_TESTS) - add_test(SocketMonitorTest socket_monitor_test) - add_test(LogSampleTest log_sample_test) - add_test(ThreadDataTest thread_data_test) -- add_test(ZmqMonitorTest zmq_monitor_test) -+ # add_test(ZmqMonitorTest zmq_monitor_test) - add_test(ZmqMonitorClientTest zmq_monitor_client_test) - add_test(SystemMetricsTest system_metrics_test) - --- -2.28.0 - diff --git a/fbzmq-no_timeout_test.patch b/fbzmq-no_timeout_test.patch deleted file mode 100644 index b2d07f2..0000000 --- a/fbzmq-no_timeout_test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2cc5de197ecc424a669fc4cec9b26064c57b0e8f Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim michel@michel-slm.name -Date: Fri, 13 Nov 2020 15:53:23 -0800 -Subject: [PATCH] Disable timeout test - -Signed-off-by: Michel Alexandre Salim michel@michel-slm.name ---- - fbzmq/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fbzmq/CMakeLists.txt b/fbzmq/CMakeLists.txt -index 5f3c8058..8560a752 100644 ---- a/fbzmq/CMakeLists.txt -+++ b/fbzmq/CMakeLists.txt -@@ -324,7 +324,7 @@ if (BUILD_TESTS) - add_test(SignalHandlerTest signal_handler_test) - add_test(ZmqEventLoopTest zmq_eventloop_test) - add_test(ZmqThrottleTest zmq_throttle_test) -- add_test(ZmqTimeoutTest zmq_timeout_test) -+ # add_test(ZmqTimeoutTest zmq_timeout_test) - add_test(CommonTest common_test) - add_test(ContextTest context_test) - add_test(MessageTest message_test) --- -2.28.0 - diff --git a/fbzmq.spec b/fbzmq.spec index 16db2a1..2b51c7c 100644 --- a/fbzmq.spec +++ b/fbzmq.spec @@ -1,25 +1,13 @@ -# link issues on some platforms: -# https://bugzilla.redhat.com/show_bug.cgi?id=1893332 -%ifarch i686 x86_64 -%bcond_without static -%else -%bcond_with static -%endif - %bcond_without tests
Name: fbzmq -Version: 2021.12.20.00 -Release: 2%{?dist} +Version: 2022.02.21.00 +Release: %autorelease Summary: Framework for writing services in C++ while leveraging libzmq
License: MIT URL: https://github.com/facebook/fbzmq -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# this test is failing -Patch0: %{name}-no_timeout_test.patch -# this test doesn't compile -Patch1: %{name}-no_monitor_test.patch +Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Folly is known not to work on big-endian CPUs # https://bugzilla.redhat.com/show_bug.cgi?id=1910202 @@ -59,6 +47,7 @@ awesomeness of libzmq (message passing semantics). At a high level it provides Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: cmake-filesystem +Obsoletes: %{name}-static < 2022.02.21.00-1
%description devel %{_description}
@@ -66,45 +55,11 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}.
-%if %{with static} -%global _static_builddir static_build - -%package static -Summary: Static development libraries for %{name} -BuildRequires: fbthrift-static -BuildRequires: fizz-static -BuildRequires: folly-static -BuildRequires: wangle-static -Requires: %{name}-devel%{?_isa} = %{version}-%{release} - -%description static %{_description} - -The %{name}-static package contains static libraries for -developing applications that use %{name}. -%endif - - %prep %autosetup -p1
%build -%if %{with static} -# static build -mkdir %{_static_builddir} -pushd %{_static_builddir} -%cmake .. \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_TESTS=OFF \ - -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name}-static \ - -DFBTHRIFT_ROOT=%{_libdir}/cmake/fbthrift-static \ - -DFIZZ_ROOT=%{_libdir}/cmake/fizz-static \ - -DFOLLY_ROOT=%{_libdir}/cmake/folly-static \ - -DWANGLE_ROOT=%{_libdir}/cmake/wangle-static -%cmake_build -popd -%endif - %cmake \ -DBUILD_SHARED_LIBS=ON \ %if %{with tests} @@ -119,15 +74,9 @@ popd
%install -%if %{with static} -pushd %{_static_builddir} -%cmake_install -popd -%endif - %cmake_install
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%if %{with tests} @@ -151,15 +100,7 @@ popd %{_libdir}/*.so %{_libdir}/cmake/%{name}
-%if %{with static} -%files static -%{_libdir}/*.a -%{_libdir}/cmake/%{name}-static -%endif
%changelog -* Thu Jan 20 2022 Fedora Release Engineering releng@fedoraproject.org - 2021.12.20.00-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - %autochangelog diff --git a/sources b/sources index d31b998..a05e9a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fbzmq-2021.12.20.00.tar.gz) = 501ae000bb7c5d9a173b356a97cb9e5615c2cc71e6a78d3e5afb67cd1cc40e12ed630f970c181ac2380168d88f1179c7d250616d95a3c876ded92245db0036d7 +SHA512 (fbzmq-2022.02.21.00.tar.gz) = f9de46481e30aabd53255644924251ddb02b607911fe093502a94ed591e68adf901c8303014ca846505e0b3bddb6fed0e16f676432014249ebe5714438a1691f
commit d267c295abe30a3cd423397617e46cc7fec8588c Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jan 20 02:42:59 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/fbzmq.spec b/fbzmq.spec index 3a13cce..16db2a1 100644 --- a/fbzmq.spec +++ b/fbzmq.spec @@ -10,7 +10,7 @@
Name: fbzmq Version: 2021.12.20.00 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework for writing services in C++ while leveraging libzmq
License: MIT @@ -159,4 +159,7 @@ popd
%changelog +* Thu Jan 20 2022 Fedora Release Engineering releng@fedoraproject.org - 2021.12.20.00-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + %autochangelog
arch-excludes@lists.fedoraproject.org