[packages/talloc] - updated to 2.1.16 - added python3- packages

qboosh qboosh at pld-linux.org
Wed Mar 13 20:38:51 CET 2019


commit ef799f19db2531467094e52ccc2316d2120a01b0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Mar 13 20:44:39 2019 +0100

    - updated to 2.1.16
    - added python3- packages

 talloc.spec | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 69 insertions(+), 15 deletions(-)
---
diff --git a/talloc.spec b/talloc.spec
index 45eaba4..7a79227 100644
--- a/talloc.spec
+++ b/talloc.spec
@@ -1,25 +1,36 @@
+#
+# Conditional build:
+%bcond_without	python2	# CPython 2.x library
+
 Summary:	The talloc library - a hierarchical pool based memory system
 Summary(pl.UTF-8):	Biblioteka talloc - system przydzielania pamięci oparty na hierarchicznej puli
 Name:		talloc
-Version:	2.1.14
+Version:	2.1.16
 Release:	1
 Epoch:		2
 License:	LGPL v3+
 Group:		Libraries
 Source0:	https://www.samba.org/ftp/talloc/%{name}-%{version}.tar.gz
-# Source0-md5:	7478da02e309316231a497a9f17a980d
+# Source0-md5:	4ff5a73fbfc92ae7e9c63ceb7b4ee025
 URL:		http://talloc.samba.org/
 BuildRequires:	docbook-dtd42-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	libxslt-progs
+%if %{with python2}
 BuildRequires:	python >= 1:2.4.2
 BuildRequires:	python-devel >= 1:2.4.2
-BuildRequires:	python-modules
+%endif
+BuildRequires:	python3 >= 1:3.2
+BuildRequires:	python3-devel >= 1:3.2
+BuildRequires:	python3-modules >= 1:3.2
 BuildRequires:	rpm-pythonprov
 Provides:	libtalloc = 2:%{version}-%{release}
 Obsoletes:	libtalloc < 2:2.0.7-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# %{_includedir}/pytalloc.h shared between python*-talloc-devel
+%define		_duplicate_files_terminate_build	0
+
 %description
 The talloc library implements a hierarchical allocator with
 destructors.
@@ -46,44 +57,73 @@ Pliki programistyczne potrzebne do tworzenia programów używających
 biblioteki talloc.
 
 %package -n python-talloc
-Summary:	Python binding for talloc library
-Summary(pl.UTF-8):	Wiązanie Pythona do biblioteki talloc
+Summary:	Python 2 binding for talloc library
+Summary(pl.UTF-8):	Wiązanie Pythona 2 do biblioteki talloc
 Group:		Libraries/Python
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	python-libs >= 1:2.4.2
 
 %description -n python-talloc
-Python binding for talloc library.
+Python 2 binding for talloc library.
 
 %description -n python-talloc -l pl.UTF-8
-Wiązanie Pythona do biblioteki talloc.
+Wiązanie Pythona 2 do biblioteki talloc.
 
 %package -n python-talloc-devel
-Summary:	Development files for pytalloc-util library
-Summary(pl.UTF-8):	Pliki programistyczne biblioteki pytalloc-util
+Summary:	Development files for Python 2 pytalloc-util library
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki pytalloc-util dla Pythona 2
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 Requires:	python-devel >= 1:2.4.2
 Requires:	python-talloc = %{epoch}:%{version}-%{release}
 
 %description -n python-talloc-devel
-Development files for pytalloc-util library.
+Development files for Python 2 pytalloc-util library.
 
 %description -n python-talloc-devel -l pl.UTF-8
-Pliki programistyczne biblioteki pytalloc-util.
+Pliki programistyczne biblioteki pytalloc-util dla Pythona 2.
+
+%package -n python3-talloc
+Summary:	Python 3 binding for talloc library
+Summary(pl.UTF-8):	Wiązanie Pythona 3 do biblioteki talloc
+Group:		Libraries/Python
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	python3-libs >= 1:3.2
+
+%description -n python3-talloc
+Python 2 binding for talloc library.
+
+%description -n python3-talloc -l pl.UTF-8
+Wiązanie Pythona 3 do biblioteki talloc.
+
+%package -n python3-talloc-devel
+Summary:	Development files for Python 3 pytalloc-util library
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki pytalloc-util dla Pythona 3
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:	python-devel >= 1:3.2
+Requires:	python-talloc = %{epoch}:%{version}-%{release}
+
+%description -n python3-talloc-devel
+Development files for Python 3 pytalloc-util library.
+
+%description -n python3-talloc-devel -l pl.UTF-8
+Pliki programistyczne biblioteki pytalloc-util dla Pythona 3.
 
 %prep
 %setup -q
 
 %build
-# note: configure in fact is waf call
+# threading breaks waf
+export JOBS=1
+
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags}" \
-PYTHONDIR=%{py_sitedir} \
-./configure \
+%{__python3} buildtools/bin/waf configure \
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
-	--disable-rpath
+	--disable-rpath \
+	--extra-python="%{__python}"
 
 %{__make} \
 	V=1
@@ -117,6 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/talloc.pc
 %{_mandir}/man3/talloc.3*
 
+%if %{with python2}
 %files -n python-talloc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpytalloc-util.so.*.*.*
@@ -128,3 +169,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libpytalloc-util.so
 %{_includedir}/pytalloc.h
 %{_pkgconfigdir}/pytalloc-util.pc
+%endif
+
+%files -n python3-talloc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpytalloc-util.cpython-3*.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpytalloc-util.cpython-3*.so.2
+%attr(755,root,root) %{py3_sitedir}/talloc.cpython-3*.so
+
+%files -n python3-talloc-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpytalloc-util.cpython-3*.so
+%{_includedir}/pytalloc.h
+%{_pkgconfigdir}/pytalloc-util.cpython-3*.pc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/talloc.git/commitdiff/ef799f19db2531467094e52ccc2316d2120a01b0



More information about the pld-cvs-commit mailing list