[packages/czmq] - updated to 4.2.0 (note: new soname) - updated link patch - removed obsolete no-Werror patch - buil

qboosh qboosh at pld-linux.org
Wed Apr 8 19:02:25 CEST 2020 

commit ba51478bf6c06dda56503c0ce238e450dd4e1a51
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 8 19:02:25 2020 +0200

    - updated to 4.2.0 (note: new soname)
    - updated link patch
    - removed obsolete no-Werror patch
    - build python bindings

 czmq-link.patch |  15 +++----
 czmq.spec       | 128 ++++++++++++++++++++++++++++++++++++++++++++++----------
 no-Werror.patch |  11 -----
 3 files changed, 113 insertions(+), 41 deletions(-)
---
diff --git a/czmq.spec b/czmq.spec
index 3101165..3e6346c 100644
--- a/czmq.spec
+++ b/czmq.spec
@@ -1,23 +1,43 @@
+#
+# Conditional build:
+%bcond_without	python2	# CPython 2.x module
+%bcond_without	python3	# CPython 3.x module
+
 Summary:	High-level C binding for 0MQ
 Summary(pl.UTF-8):	Wysokopoziomowe wiązania C dla 0MQ
 Name:		czmq
-Version:	3.0.2
+Version:	4.2.0
 Release:	1
 License:	LGPL v3+
 Group:		Libraries
-Source0:	http://download.zeromq.org/%{name}-%{version}.tar.gz
-# Source0-md5:	7697688bf65a35bc33ae2db51ebb0e3b
-Patch0:		no-Werror.patch
+#Source0Download: https://github.com/zeromq/czmq/releases
+Source0:	https://github.com/zeromq/czmq/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	7e09997db6ac3b25e8ed104053040722
 Patch1:		%{name}-link.patch
 URL:		http://zeromq.org/
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
-BuildRequires:	libsodium-devel
+BuildRequires:	curl-devel >= 7.28.0
+BuildRequires:	libmicrohttpd-devel
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
+BuildRequires:	lz4-devel
+%if %{with python2}
+BuildRequires:	python-devel >= 1:2.5
+BuildRequires:	python-setuptools
+%endif
+%if %{with python3}
+BuildRequires:	python3-devel >= 1:3.2
+BuildRequires:	python3-setuptools
+%endif
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.714
+BuildRequires:	systemd-devel >= 1:200
 BuildRequires:	xmlto
 BuildRequires:	zeromq-devel >= 4
+Requires:	curl-libs >= 7.28.0
+Requires:	systemd-libs >= 1:200
 Requires:	zeromq >= 4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,6 +52,11 @@ Summary:	Header files for CZMQ library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki CZMQ
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	curl-devel >= 7.28.0
+Requires:	libmicrohttpd-devel
+Requires:	libuuid-devel
+Requires:	lz4-devel
+Requires:	systemd-devel >= 1:200
 Requires:	zeromq-devel >= 4
 
 %description devel
@@ -52,9 +77,32 @@ Static CZMQ library.
 %description static -l pl.UTF-8
 Statyczna biblioteka CZMQ.
 
+%package -n python-czmq
+Summary:	Python 2 bindings for CZMQ
+Summary(pl.UTF-8):	Wiązania Pythona 2 do CZMQ
+Group:		Libraries/Python
+Requires:	%{name} = %{version}-%{release}
+
+%description -n python-czmq
+Python 2 bindings for CZMQ - the high level C binding for 0MQ.
+
+%description -n python-czmq -l pl.UTF-8
+Wiązania Pythona 2 do CZMQ - wysokopoziomowego wiązania C do 0MQ.
+
+%package -n python3-czmq
+Summary:	Python 3 bindings for CZMQ
+Summary(pl.UTF-8):	Wiązania Pythona 3 do CZMQ
+Group:		Libraries/Python
+Requires:	%{name} = %{version}-%{release}
+
+%description -n python3-czmq
+Python 3 bindings for CZMQ - the high level C binding for 0MQ.
+
+%description -n python3-czmq -l pl.UTF-8
+Wiązania Pythona 3 do CZMQ - wysokopoziomowego wiązania C do 0MQ.
+
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -65,51 +113,70 @@ Statyczna biblioteka CZMQ.
 %{__automake}
 # use include subdir - file names could be too common (zfile.h etc.)
 %configure \
+	--enable-bindings-python \
 	--disable-silent-rules \
 	--includedir=%{_includedir}/czmq
 %{__make}
 
+cd bindings/python
+
+%if %{with python2}
+%py_build
+%endif
+
+%if %{with python3}
+%py3_build
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+cd bindings/python
+
+%if %{with python2}
+%py_install
+
+%py_postclean
+%endif
+
+%if %{with python3}
+%py3_install
+%endif
+
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libczmq.la
 
-# too common name
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/{makecert,czmq_makecert}
-%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{makecert,czmq_makecert}.1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README.md
-%attr(755,root,root) %{_bindir}/czmq_makecert
+%attr(755,root,root) %{_bindir}/zmakecert
 %attr(755,root,root) %{_libdir}/libczmq.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libczmq.so.3
-%{_mandir}/man1/czmq_makecert.1*
+%attr(755,root,root) %ghost %{_libdir}/libczmq.so.4
+%{_mandir}/man1/zmakecert.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libczmq.so
 %{_includedir}/czmq
 %{_pkgconfigdir}/libczmq.pc
+%dir %{_datadir}/zproject
+%{_datadir}/zproject/czmq
 %{_mandir}/man3/zactor.3*
+%{_mandir}/man3/zargs.3*
 %{_mandir}/man3/zarmour.3*
 %{_mandir}/man3/zauth.3*
-%{_mandir}/man3/zauth_v2.3*
 %{_mandir}/man3/zbeacon.3*
-%{_mandir}/man3/zbeacon_v2.3*
 %{_mandir}/man3/zcert.3*
 %{_mandir}/man3/zcertstore.3*
 %{_mandir}/man3/zchunk.3*
 %{_mandir}/man3/zclock.3*
 %{_mandir}/man3/zconfig.3*
-%{_mandir}/man3/zctx.3*
 %{_mandir}/man3/zdigest.3*
 %{_mandir}/man3/zdir.3*
 %{_mandir}/man3/zdir_patch.3*
@@ -118,28 +185,43 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/zgossip.3*
 %{_mandir}/man3/zhash.3*
 %{_mandir}/man3/zhashx.3*
+%{_mandir}/man3/zhttp_client.3*
+%{_mandir}/man3/zhttp_request.3*
+%{_mandir}/man3/zhttp_response.3*
+%{_mandir}/man3/zhttp_server.3*
+%{_mandir}/man3/zhttp_server_options.3*
 %{_mandir}/man3/ziflist.3*
 %{_mandir}/man3/zlist.3*
 %{_mandir}/man3/zlistx.3*
 %{_mandir}/man3/zloop.3*
 %{_mandir}/man3/zmonitor.3*
-%{_mandir}/man3/zmonitor_v2.3*
 %{_mandir}/man3/zmsg.3*
-%{_mandir}/man3/zmutex.3*
 %{_mandir}/man3/zpoller.3*
+%{_mandir}/man3/zproc.3*
 %{_mandir}/man3/zproxy.3*
-%{_mandir}/man3/zproxy_v2.3*
 %{_mandir}/man3/zrex.3*
 %{_mandir}/man3/zsock.3*
-%{_mandir}/man3/zsock_option.3*
-%{_mandir}/man3/zsocket.3*
-%{_mandir}/man3/zsockopt.3*
 %{_mandir}/man3/zstr.3*
 %{_mandir}/man3/zsys.3*
-%{_mandir}/man3/zthread.3*
+%{_mandir}/man3/ztimerset.3*
+%{_mandir}/man3/ztrie.3*
 %{_mandir}/man3/zuuid.3*
 %{_mandir}/man7/czmq.7*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libczmq.a
+
+%if %{with python2}
+%files -n python-czmq
+%defattr(644,root,root,755)
+%{py_sitescriptdir}/czmq
+%{py_sitescriptdir}/czmq-%{version}-py*.egg-info
+%endif
+
+%if %{with python3}
+%files -n python3-czmq
+%defattr(644,root,root,755)
+%{py3_sitescriptdir}/czmq
+%{py3_sitescriptdir}/czmq-%{version}-py*.egg-info
+%endif
diff --git a/czmq-link.patch b/czmq-link.patch
index cbfc898..d88309a 100644
--- a/czmq-link.patch
+++ b/czmq-link.patch
@@ -1,10 +1,11 @@
---- czmq-3.0.2/Makefile.am.orig	2015-06-08 09:27:00.000000000 +0200
-+++ czmq-3.0.2/Makefile.am	2015-08-01 08:54:46.187642532 +0200
-@@ -10,6 +10,7 @@
+--- czmq-4.2.0/Makefile.am.orig	2020-04-07 19:34:47.841128420 +0200
++++ czmq-4.2.0/Makefile.am	2020-04-07 19:35:40.744175153 +0200
+@@ -15,7 +15,7 @@
+     ${libmicrohttpd_CFLAGS} \
      -I$(srcdir)/include
  
- project_libs = \
-+    -lpthread \
-     ${zmq_LIBS}
+-project_libs = ${libzmq_LIBS} ${uuid_LIBS} ${systemd_LIBS} ${lz4_LIBS} ${libcurl_LIBS} ${libmicrohttpd_LIBS}
++project_libs = ${libzmq_LIBS} ${uuid_LIBS} ${systemd_LIBS} ${lz4_LIBS} ${libcurl_LIBS} ${libmicrohttpd_LIBS} -lpthread
  
- SUBDIRS =
+ SUBDIRS = doc
+ SUBDIRS += include
diff --git a/no-Werror.patch b/no-Werror.patch
deleted file mode 100644
index ed9256f..0000000
--- a/no-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- czmq-3.0.2/configure.ac.orig	2015-08-01 07:43:07.877822916 +0200
-+++ czmq-3.0.2/configure.ac	2015-08-01 08:08:51.497758136 +0200
-@@ -246,7 +246,7 @@
- 
- # These options are GNU compiler specific.
- if test "x$GCC" = "xyes"; then
--    CPPFLAGS="-pedantic -Werror -Wall -Wc++-compat ${CPPFLAGS}"
-+    CPPFLAGS="-pedantic -Wall -Wc++-compat ${CPPFLAGS}"
- fi
- 
- AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/czmq.git/commitdiff/ba51478bf6c06dda56503c0ce238e450dd4e1a51

More information about the pld-cvs-commit mailing list