commit e7bf297ec7e6122756ae41d77e2c26110ec04e04
Author: Adam Gołębiowski <[email protected]>
Date: Wed Mar 20 11:53:25 2019 +0100
- updated to 1.5.4 (1.4.x on LDB_1_4 branch)
- reverse python bcond logic, make python3 default
ldb.spec | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/ldb.spec b/ldb.spec
index 5d63e2b..97aa9e1 100644
--- a/ldb.spec
+++ b/ldb.spec
@@ -3,7 +3,7 @@
#
# Conditional build:
%bcond_without lmdb # LMDB module (64-bit only)
-%bcond_without python3 # CPython 3.x interface
+%bcond_without python2 # CPython 2.x interface
#
%ifnarch %{x8664} aarch64 alpha mips64 ppc64 s390x sparc64
# lmdb support requires 64-bit size_t
@@ -15,12 +15,12 @@
Summary: LDAP-like embedded database
Summary(pl.UTF-8): Wbudowana baza danych podobna do LDAP
Name: ldb
-Version: 1.4.6
-Release: 2
+Version: 1.5.4
+Release: 1
License: LGPL v3+
Group: Libraries
Source0: https://www.samba.org/ftp/ldb/%{name}-%{version}.tar.gz
-# Source0-md5: 3951773a4fed1b3ae27af24972c2ac50
+# Source0-md5: 24d9f18b085ba27f96d4dec643abea39
URL: https://ldb.samba.org/
BuildRequires: cmocka-devel >= 1.1.1
BuildRequires: docbook-style-xsl
@@ -28,16 +28,16 @@ BuildRequires: libxslt-progs
%{?with_lmdb:BuildRequires: lmdb-devel >= 0.9.16}
BuildRequires: openldap-devel
BuildRequires: popt-devel >= 1.6
+%if %{with python2}
BuildRequires: python-devel >= 1:2.4.2
BuildRequires: python-talloc-devel >= %{talloc_version}
BuildRequires: python-tdb >= %{tdb_version}
BuildRequires: python-tevent >= %{tevent_version}
-%if %{with python3}
+%endif
BuildRequires: python3-devel >= 1:3.2
BuildRequires: python3-talloc-devel >= %{talloc_version}
BuildRequires: python3-tdb >= %{tdb_version}
BuildRequires: python3-tevent >= %{tevent_version}
-%endif
BuildRequires: rpmbuild(macros) >= 1.507
BuildRequires: talloc-devel >= %{talloc_version}
BuildRequires: tdb-devel >= %{tdb_version}
@@ -161,7 +161,7 @@ CFLAGS="%{rpmcflags}" \
--bundled-libraries=NONE \
--disable-rpath \
--disable-rpath-install \
- %{?with_python3:--extra-python=%{__python3}}
+ %{?with_python2:--extra-python=%{__python}}
%{__make} \
V=1
@@ -171,14 +171,14 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%if %{with python2}
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_postclean
+%endif
-%if %{with python3}
%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
-%endif
# Shared libraries need to be marked executable for
# rpmbuild to strip them and include them in debuginfo
@@ -202,6 +202,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %ghost %{_libdir}/libldb.so.1
%dir %{_libdir}/ldb
%attr(755,root,root) %{_libdir}/ldb/libldb-key-value.so
+%attr(755,root,root) %{_libdir}/ldb/libldb-tdb-err-map.so
+%attr(755,root,root) %{_libdir}/ldb/libldb-tdb-int.so
%{?with_lmdb:%attr(755,root,root) %{_libdir}/ldb/libldb-mdb-int.so}
%dir %{_libdir}/ldb/modules
%dir %{_libdir}/ldb/modules/ldb
@@ -234,6 +236,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/ldb.pc
%{_mandir}/man3/ldb.3*
+%if %{with python2}
%files -n python-ldb
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpyldb-util.so.*.*.*
@@ -246,8 +249,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libpyldb-util.so
%{_includedir}/pyldb.h
%{_pkgconfigdir}/pyldb-util.pc
+%endif
-%if %{with python3}
%files -n python3-ldb
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpyldb-util.cpython-3*.so.*.*.*
@@ -261,4 +264,3 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libpyldb-util.cpython-3*.so
%{_includedir}/pyldb.h
%{_pkgconfigdir}/pyldb-util.cpython-3*.pc
-%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ldb.git/commitdiff/e7bf297ec7e6122756ae41d77e2c26110ec04e04
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
