From 13c901b7afbebd5fc92ef5fb8bdc466b145abb60 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Tue, 24 Oct 2023 20:29:42 +0200 Subject: [PATCH] Revert "CMake / Improved the build" This reverts commit b80422b75f353bdd12edeb8b05a81ac78add223a. --- zeromq.spec | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/zeromq.spec b/zeromq.spec index d581cf4..0bc3d97 100644 --- a/zeromq.spec +++ b/zeromq.spec @@ -26,7 +26,6 @@ BuildRequires: openpgm-devel BuildRequires: krb5-devel %endif -# https://github.com/zeromq/libzmq/pull/4609 - Upgrade of CMake files Patch0: zeromq-fix-cmake-warnings.patch %description @@ -49,12 +48,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package doc -Summary: HTML documentation for the %{name} library -BuildArch: noarch - -%description doc -This package contains HTML pages for %{name}. %prep %autosetup -p1 @@ -75,20 +68,6 @@ chmod -x src/xsub.hpp %install %cmake_install -# Doc -mv -f %{buildroot}/usr/doc/zmq %{buildroot}%{_docdir}/ - -# Manual pages -install -d %{buildroot}%{_mandir}/{man3,man7} -install -pm 0644 doc/*.3 %{buildroot}%{_mandir}/man3/ -install -pm 0644 doc/*.7 %{buildroot}%{_mandir}/man7/ - -# Static library -rm -f %{buildroot}%{_libdir}/libzmq.a - -# Unused binaries -rm -f %{buildroot}%{_bindir}/{inproc_lat,inproc_thr,local_lat,local_thr,proxy_thr,remote_lat,remote_thr} - %check %ifnarch s390x %ctest @@ -100,7 +79,7 @@ make check V=1 || ( cat test-suite.log && exit 1 ) %files %doc README.md AUTHORS NEWS %license LICENSE -#%%{_bindir}/curve_keygen +%{_bindir}/curve_keygen %{_libdir}/libzmq.so.5* %{_mandir}/man3/zmq_* %{_mandir}/man7/zmq_* @@ -110,10 +89,7 @@ make check V=1 || ( cat test-suite.log && exit 1 ) %{_libdir}/libzmq.so %{_libdir}/pkgconfig/libzmq.pc %{_includedir}/zmq*.h -%{_libdir}/cmake/ZeroMQ/ - -%files doc -%{_docdir}/zmq/ +%{_libdir}/cmake/ZeroMQ %changelog %autochangelog