[packages/cppzmq] - updated to 4.9.0 - moved .pc file to _npkgconfigdir, changed package to noarch

qboosh qboosh at pld-linux.org
Sun Apr 9 21:25:19 CEST 2023


commit 19bc0b64581fa05070b09c748ba55f6d3dad707a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 9 21:27:54 2023 +0200

    - updated to 4.9.0
    - moved .pc file to _npkgconfigdir, changed package to noarch

 cppzmq-nostatic.patch | 10 ----------
 cppzmq.spec           | 22 +++++++++++++---------
 2 files changed, 13 insertions(+), 19 deletions(-)
---
diff --git a/cppzmq.spec b/cppzmq.spec
index 95de679..d2c62f9 100644
--- a/cppzmq.spec
+++ b/cppzmq.spec
@@ -1,18 +1,18 @@
 Summary:	CPP-ZMQ library
 Summary(pl.UTF-8):	Biblioteka CPP-ZMQ
 Name:		cppzmq
-Version:	4.2.2
-Release:	2
+Version:	4.9.0
+Release:	1
 License:	MIT
 Group:		Development/Libraries
 #Source0Download: https://github.com/zeromq/cppzmq/releases
 Source0:	https://github.com/zeromq/cppzmq/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	bd809b47296e77fe9f192bd9dafd5cc3
-Patch0:		%{name}-nostatic.patch
+# Source0-md5:	80f3400f5d6cc48cee0fe1a045d78718
 URL:		https://github.com/zeromq/cppzmq
-BuildRequires:	cmake >= 3.0.0
+BuildRequires:	cmake >= 3.11
 BuildRequires:	pkgconfig
-BuildRequires:	zeromq-devel >= %{version}
+BuildRequires:	zeromq-devel >= 4
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,7 +25,7 @@ CPP-ZMQ to interfejs C++ do biblioteki ØMQ.
 Summary:	CPP-ZMQ header files
 Summary(pl.UTF-8):	Pliki nagłówkowe CPP-ZMQ
 Group:		Development/Libraries
-Requires:	zeromq-devel >= %{version}
+Requires:	zeromq-devel >= 4
 
 %description devel
 Header files which constitute CPP-ZMQ library.
@@ -39,7 +39,6 @@ CPP-ZMQ to interfejs C++ do biblioteki ØMQ.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build
@@ -54,12 +53,17 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# use arch-independent pkg-config dir, so package can be noarch
+install -d $RPM_BUILD_ROOT%{_npkgconfigdir}
+%{__mv} $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc $RPM_BUILD_ROOT%{_npkgconfigdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc LICENSE README
+%doc LICENSE README.md
 %{_includedir}/zmq.hpp
 %{_includedir}/zmq_addon.hpp
+%{_npkgconfigdir}/cppzmq.pc
 %{_datadir}/cmake/cppzmq
diff --git a/cppzmq-nostatic.patch b/cppzmq-nostatic.patch
deleted file mode 100644
index 0978562..0000000
--- a/cppzmq-nostatic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cppzmq-4.2.2/libzmqPkgConfigFallback.cmake.orig	2017-07-31 15:30:55.000000000 +0200
-+++ cppzmq-4.2.2/libzmqPkgConfigFallback.cmake	2017-12-25 14:33:02.688755906 +0100
-@@ -15,6 +15,6 @@
- set_property(TARGET libzmq-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS})
- set_property(TARGET libzmq-static PROPERTY IMPORTED_LOCATION ${ZeroMQ_STATIC_LIBRARY})
- 
--if(ZeroMQ_LIBRARY AND ZeroMQ_STATIC_LIBRARY)
-+if(ZeroMQ_LIBRARY)
-     set(ZeroMQ_FOUND ON)
- endif()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cppzmq.git/commitdiff/19bc0b64581fa05070b09c748ba55f6d3dad707a



More information about the pld-cvs-commit mailing list