Accepting request 343929 from network:samba:STABLE
- Update to 1.1.23; (bsc#954658). + Test improvements + Improved python3 bindings; (bsc#951911) + Minor build fixes OBS-URL: https://build.opensuse.org/request/show/343929 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ldb?expand=0&rev=26
This commit is contained in:
commit
ffd311b8d0
@ -1,3 +1,4 @@
|
||||
libldb1
|
||||
python-ldb
|
||||
obsoletes "pyldb-<targettype> < <version>"
|
||||
python3-ldb
|
||||
|
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABAgAGBQJVrq02AAoJEEeTkWETCEAl31EH/2bCBARl5ZPabj2us3opUhCL
|
||||
G3RbNsE6OC38eVjukCvVMDCXcBUIC1+mMVT0wt2I9AXuHbQ+Af8783lArdqMbVyy
|
||||
4kDkrJogJr4gFSNNij3h7l0e9xo8VX3epKhnmce+GnVm5FDxs1Bq2s4h7WDt1ZRI
|
||||
FGl0hgciCfSi1n1K1bPb2BcQgN5N/Hb3AarS1LrriQKBk2YQJ97FLtibToYKehA4
|
||||
2QS4TlwsLrnW9IADU/7tslOZ72eaF9ypfzJfBKk9fr9+CcGseIZWKDmanv2NfWhe
|
||||
fMIhqXMT47zo9umDZNWvdp95OP6wj9zMJ2vd0KmKdCO6P1lrDsDkj2o4J4m0C80=
|
||||
=miXo
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:267bbb7f278068eaf0de27adffda2e691a070a93c5c15ee27c828e87b4c7dbf1
|
||||
size 1244825
|
11
ldb-1.1.23.tar.asc
Normal file
11
ldb-1.1.23.tar.asc
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABAgAGBQJWPKt1AAoJEEeTkWETCEAl+6oH/R5jor1G2qouI52wI/s50luD
|
||||
kaS7AGLTN4owtLXkyGuWs9XEV3VFyFN0uGQOUFYTkRlqw3gOVD4DvvWJb9xPjlkf
|
||||
sNNSCCpcLu1hmoPiy5Tvh6sjustbx1cuAn6jjsYRT81L+qPY4qbGYrqh2BsV9Nxk
|
||||
MzI1KT3ax1u0jdRj+mYfT2vO3ZibuIVjUaQb9OTMhy8syMP2XAj8taHj7qekWlZz
|
||||
TuBfhBmf+LCY8TnIhpSDRusg+CajjsFylWeb1Gb5sBrDtfYq2KLT8qpvZB/G4o93
|
||||
A7wCqqZ9a3hdY46pqAD0a3z4qUAiNM64IgNXIESYswxvF/oagB4NPToGSuFVny4=
|
||||
=yfFU
|
||||
-----END PGP SIGNATURE-----
|
3
ldb-1.1.23.tar.gz
Normal file
3
ldb-1.1.23.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8f8b2f7f04b24c847d088a091e6a2261ac6c7810fc711f553d3b61a3dee39559
|
||||
size 1258249
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 11 17:53:45 UTC 2015 - lmuelle@suse.com
|
||||
|
||||
- Update to 1.1.23; (bsc#954658).
|
||||
+ Test improvements
|
||||
+ Improved python3 bindings; (bsc#951911)
|
||||
+ Minor build fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 30 13:15:15 UTC 2015 - lmuelle@suse.com
|
||||
|
||||
|
86
ldb.spec
86
ldb.spec
@ -17,14 +17,17 @@
|
||||
|
||||
|
||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
%{!?py3_soflags: %global py3_soflags cpython-%{python3_version_nodots}m}
|
||||
%if 0%{?suse_version} > 1310 || 0%{?fedora_version} > 20
|
||||
%define with_python3 1
|
||||
%else
|
||||
%define with_python3 0
|
||||
%endif
|
||||
|
||||
%define talloc_version 2.1.4
|
||||
%define tdb_version 1.3.7
|
||||
%define tevent_version 0.9.25
|
||||
|
||||
# this ldb_version macro gets obsoleted with the next minor version update
|
||||
%define ldb_version 1.1.21
|
||||
|
||||
Name: ldb
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: doxygen
|
||||
@ -38,19 +41,22 @@ BuildRequires: python-devel
|
||||
BuildRequires: python-talloc-devel >= %{talloc_version}
|
||||
BuildRequires: python-tdb >= %{tdb_version}
|
||||
BuildRequires: python-tevent >= %{tevent_version}
|
||||
%if %{with_python3}
|
||||
BuildRequires: python3-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
|
||||
%define build_make_smp_mflags %{?_smp_mflags}
|
||||
%else
|
||||
%define build_make_smp_mflags %{?jobs:-j%jobs}
|
||||
%endif
|
||||
Url: http://ldb.samba.org/
|
||||
Version: %{ldb_version}.0
|
||||
Version: 1.1.23
|
||||
Release: 0
|
||||
Summary: An LDAP-like embedded database
|
||||
License: GPL-3.0+
|
||||
Group: System/Libraries
|
||||
Source: http://download.samba.org/pub/ldb/ldb-%{ldb_version}.tar.gz
|
||||
Source1: http://download.samba.org/pub/ldb/ldb-%{ldb_version}.tar.asc
|
||||
Source: http://download.samba.org/pub/ldb/ldb-%{version}.tar.gz
|
||||
Source1: http://download.samba.org/pub/ldb/ldb-%{version}.tar.asc
|
||||
Source2: ldb.keyring
|
||||
Source4: baselibs.conf
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -118,14 +124,42 @@ Requires: pkgconfig
|
||||
%endif
|
||||
Provides: pyldb-devel = %{version}
|
||||
Obsoletes: pyldb-devel < %{version}
|
||||
Conflicts: python3-ldb-devel
|
||||
|
||||
%description -n python-ldb-devel
|
||||
This package contains the development files for the Python bindings for the
|
||||
LDB library.
|
||||
|
||||
|
||||
%if %{with_python3}
|
||||
%package -n python3-ldb
|
||||
Summary: Python3 bindings for the LDB library
|
||||
Group: Development/Libraries/Python
|
||||
Requires: %{libldb_name} = %{version}
|
||||
PreReq: /sbin/ldconfig
|
||||
|
||||
%description -n python3-ldb
|
||||
This package contains the python3 bindings for the LDB library.
|
||||
|
||||
|
||||
%package -n python3-ldb-devel
|
||||
Summary: Development files for the Python3 bindings for the LDB library
|
||||
Group: Development/Libraries/Python
|
||||
Requires: python3-ldb = %{version}
|
||||
%if 0%{?suse_version} > 1020
|
||||
Requires: pkg-config
|
||||
%else
|
||||
Requires: pkgconfig
|
||||
%endif
|
||||
Conflicts: python-ldb-devel
|
||||
|
||||
%description -n python3-ldb-devel
|
||||
This package contains the development files for the Python bindings for the
|
||||
LDB library.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -n ldb-%{ldb_version} -q
|
||||
%setup -n ldb-%{version} -q
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 911
|
||||
@ -147,17 +181,23 @@ CONFIGURE_OPTIONS="\
|
||||
--with-modulesdir=%{_libdir} \
|
||||
--bundled-libraries=NONE \
|
||||
--builtin-libraries=replace \
|
||||
%if %{with_python3}
|
||||
--extra-python=/usr/bin/python3 \
|
||||
%endif
|
||||
"
|
||||
./configure ${CONFIGURE_OPTIONS}
|
||||
%{__make} %{build_make_smp_mflags} \
|
||||
all
|
||||
doxygen Doxyfile
|
||||
# remove man page with bogus full build dir in path
|
||||
rm -f apidocs/man/man3/_*_ldb-%{ldb_version}_include_.3
|
||||
rm -f apidocs/man/man3/_*_ldb-%{version}_include_.3
|
||||
|
||||
%check
|
||||
# make test doesn't work with --disable-rpath
|
||||
#%{__make} test
|
||||
%ifnarch ppc64
|
||||
LD_LIBRARY_PATH="bin/shared:bin/shared/private" \
|
||||
LDB_MODULES_PATH="bin/modules" \
|
||||
%{__make} test
|
||||
%endif
|
||||
|
||||
%install
|
||||
DESTDIR=${RPM_BUILD_ROOT} make install
|
||||
@ -173,6 +213,12 @@ cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
|
||||
|
||||
%postun -n python-ldb -p /sbin/ldconfig
|
||||
|
||||
%if %{with_python3}
|
||||
%post -n python3-ldb -p /sbin/ldconfig
|
||||
|
||||
%postun -n python3-ldb -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %{libldb_name}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libldb.so.*
|
||||
@ -218,12 +264,13 @@ cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
|
||||
%{_mandir}/man1/ldbsearch.1.*
|
||||
|
||||
%files -n python-ldb
|
||||
%defattr(-,root,root,-)
|
||||
%defattr(-,root,root)
|
||||
%{python_sitearch}/ldb.so
|
||||
%{python_sitearch}/_ldb_text.py*
|
||||
%{_libdir}/libpyldb-util.so.*
|
||||
|
||||
%files -n python-ldb-devel
|
||||
%defattr(-,root,root,-)
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/pyldb.h
|
||||
%{_libdir}/libpyldb-util.so
|
||||
%{_libdir}/pkgconfig/pyldb-util.pc
|
||||
@ -231,4 +278,19 @@ cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
|
||||
%{_mandir}/man3/PyLdb*.3.*
|
||||
%endif
|
||||
|
||||
%if %{with_python3}
|
||||
%files -n python3-ldb
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpyldb-util.%{py3_soflags}.so.*
|
||||
%{python3_sitearch}/_ldb_text.py
|
||||
%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599
|
||||
%{python3_sitearch}/__pycache__/_ldb_text.cpython-*.py[co]
|
||||
%endif
|
||||
%{python3_sitearch}/ldb.%{py3_soflags}.so
|
||||
|
||||
%files -n python3-ldb-devel
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpyldb-util.%{py3_soflags}.so
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user