Hello community, here is the log from the commit of package ldb for openSUSE:Factory checked in at 2015-11-24 22:21:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ldb (Old) and /work/SRC/openSUSE:Factory/.ldb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ldb" Changes: -------- --- /work/SRC/openSUSE:Factory/ldb/ldb.changes 2015-11-10 10:01:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ldb.new/ldb.changes 2015-11-24 22:21:13.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 11 17:53:45 UTC 2015 - [email protected] + +- Update to 1.1.23; (bsc#954658). + + Test improvements + + Improved python3 bindings; (bsc#951911) + + Minor build fixes + +------------------------------------------------------------------- Old: ---- ldb-1.1.21.tar.asc ldb-1.1.21.tar.gz New: ---- ldb-1.1.23.tar.asc ldb-1.1.23.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ldb.spec ++++++ --- /var/tmp/diff_new_pack.LEYtCZ/_old 2015-11-24 22:21:14.000000000 +0100 +++ /var/tmp/diff_new_pack.LEYtCZ/_new 2015-11-24 22:21:14.000000000 +0100 @@ -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-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 @@ %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 @@ --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 @@ %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 @@ %{_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 @@ %{_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 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.LEYtCZ/_old 2015-11-24 22:21:14.000000000 +0100 +++ /var/tmp/diff_new_pack.LEYtCZ/_new 2015-11-24 22:21:14.000000000 +0100 @@ -1,3 +1,4 @@ libldb1 python-ldb obsoletes "pyldb-<targettype> < <version>" +python3-ldb ++++++ ldb-1.1.21.tar.gz -> ldb-1.1.23.tar.gz ++++++ ++++ 7057 lines of diff (skipped)
