libldb-1.3.2-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11585 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libl/libldb/libldb-vl.spec

@@ -1,13 +1,13 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define _unpackaged_files_terminate_build 1
 
-%define talloc_version 2.1.9
-%define tdb_version 1.3.14
-%define tevent_version 0.9.32
+%define talloc_version 2.1.11
+%define tdb_version 1.3.15
+%define tevent_version 0.9.36
 
 Name: libldb
 Summary: A schema-less, ldap like, API and database
-Version: 1.1.31
+Version: 1.3.2
 Release: 1%{?_dist_release}
 
 Group: System Environment/Libraries
@@ -16,7 +16,7 @@ URL: http://ldb.samba.org/
 
 Source: http://samba.org/ftp/ldb/ldb-%{version}.tar.gz
 # Patches
-Patch1001: FED01-fix-tevent-check.patch
+Patch0001: 0001-ldb-Fix-memory-leak-on-module-context.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtalloc-devel >= %{talloc_version}
@@ -27,17 +27,21 @@ BuildRequires: autoconf
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 BuildRequires: python-devel
+BuildRequires: python-rpm-macros
 BuildRequires: python-tdb
-BuildRequires: pytalloc-devel
+BuildRequires: python-talloc-devel
 BuildRequires: python-tevent
+BuildRequires: python3-devel
+BuildRequires: python3-rpm-macros
+BuildRequires: python3-tdb
+BuildRequires: python3-talloc-devel
+BuildRequires: python3-tevent
 BuildRequires: doxygen
 Requires: libtalloc >= %{talloc_version}
 Requires: libtdb >= %{tdb_version}
 Requires: libtevent >= %{tevent_version}
 
 Provides: bundled(libreplace)
-Provides: bundled(libtdb_compat)
-Provides: bundled(libccan)
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -67,24 +71,54 @@ Requires: pkgconfig
 %description devel
 Header files needed to develop programs that link against the LDB library.
 
-%package -n pyldb
+%package -n python-ldb
 Group: System Environment/Libraries
 Summary: Python bindings for the LDB library
 Requires: libldb = %{version}-%{release}
 Requires: python-tdb >= %{tdb_version}
+Provides: pyldb = %{version}-%{release}
+Obsoletes: pyldb < 1.1.31-2
 
-%description -n pyldb
+%description -n python-ldb
 Python bindings for the LDB library
 
-%package -n pyldb-devel
+%package -n python-ldb-devel
 Group: Development/Libraries
 Summary: Development files for the Python bindings for the LDB library
-Requires: pyldb = %{version}-%{release}
+Requires: python-ldb = %{version}-%{release}
+Requires: python-ldb-devel-common = %{version}-%{release}
+Provides: pyldb-devel = %{version}-%{release}
+Obsoletes: pyldb-devel <= 1.1.31-2
 
-%description -n pyldb-devel
+%description -n python-ldb-devel
 Development files for the Python bindings for the LDB library
 
-%if %build_compat32
+%package -n python-ldb-devel-common
+Summary: Common development files for the Python bindings for the LDB library
+
+%description -n python-ldb-devel-common
+Development files for the Python bindings for the LDB library.
+This package includes files that aren't specific to a Python version.
+
+%package -n python3-ldb
+Group: System Environment/Libraries
+Summary: Python3 bindings for the LDB library
+Requires: libldb = %{version}-%{release}
+Requires: python3-tdb >= %{tdb_version}
+
+%description -n python3-ldb
+Python3 bindings for the LDB library
+
+%package -n python3-ldb-devel
+Group: Development/Libraries
+Summary: Development files for the Python3 bindings for the LDB library
+Requires: python3-ldb = %{version}-%{release}
+Requires: python-ldb-devel-common = %{version}-%{release}
+
+%description -n python3-ldb-devel
+Development files for the Python3 bindings for the LDB library
+
+%if %{build_compat32}
 
 %package -n compat32-%{name}
 Summary: A schema-less, ldap like, API and database
@@ -98,19 +132,20 @@ servers, or use local tdb databases.
 
 %prep
 %setup -q -n ldb-%{version}
-
-%patch1001 -p1
+%patch1 -p3
 
 %build
 
 # tdb_compat and ccan have no upstream releases to link against yet and their
 # API is in flux. It is unsafe to make them public and shared at this time.
-%configure --disable-rpath \
-           --disable-rpath-install \
-           --bundled-libraries=cmocka \
-           --builtin-libraries=tdb_compat,ccan,replace \
-           --with-modulesdir=%{_libdir}/ldb/modules \
-           --with-privatelibdir=%{_libdir}/ldb
+%configure \
+	--disable-rpath \
+	--disable-rpath-install \
+	--bundled-libraries=cmocka \
+	--builtin-libraries=replace \
+	--with-modulesdir=%{_libdir}/ldb/modules \
+	--with-privatelibdir=%{_libdir}/ldb \
+	--extra-python=%{__python3}
 
 make V=1 %{?_smp_mflags}
 doxygen Doxyfile
@@ -120,9 +155,6 @@ make install DESTDIR=%{buildroot}
 
 rm -f %{buildroot}%{_libdir}/libldb.a
 
-# Remove _tevent.so (it's managed by python-tevent)
-#rm -f %{buildroot}/%{python_sitearch}/_tevent.so
-
 # Shared libraries need to be marked executable for
 # rpmbuild to strip them and include them in debuginfo
 find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \;
@@ -130,9 +162,9 @@ find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \;
 # Install API docs
 cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
 
-# drop garbages
-rm -f %{buildroot}%{_mandir}/man3/_home_vbuilder_rpm_BUILD_ldb-*_include_.3*
-rm -f %{buildroot}%{_mandir}/man3/ldif_read_file_state.3*
+# LDB 1.1.8+ bug: remove manpage named after full
+# file path
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 
 %clean
 rm -rf %{buildroot}
@@ -143,13 +175,19 @@ rm -rf %{buildroot}
 %postun
 /sbin/ldconfig
 
-%post -n pyldb
+%post -n python-ldb
+/sbin/ldconfig
+
+%postun -n python-ldb
+/sbin/ldconfig
+
+%post -n python3-ldb
 /sbin/ldconfig
 
-%postun -n pyldb
+%postun -n python3-ldb
 /sbin/ldconfig
 
-%if %build_compat32
+%if %{build_compat32}
 
 %post -n compat32-%{name}
 /sbin/ldconfig
@@ -162,11 +200,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %dir %{_libdir}/ldb
+%{_libdir}/ldb/libcmocka-ldb.so
 %{_libdir}/libldb.so.*
 %dir %{_libdir}/ldb/modules
 %dir %{_libdir}/ldb/modules/ldb
-%{_libdir}/ldb/libldb-cmdline.so
-%{_libdir}/ldb/libcmocka-ldb.so
 %{_libdir}/ldb/modules/ldb/*.so
 
 %files -n ldb-tools
@@ -177,6 +214,7 @@ rm -rf %{buildroot}
 %{_bindir}/ldbmodify
 %{_bindir}/ldbrename
 %{_bindir}/ldbsearch
+%{_libdir}/ldb/libldb-cmdline.so
 %{_mandir}/man1/ldbadd.1.*
 %{_mandir}/man1/ldbdel.1.*
 %{_mandir}/man1/ldbedit.1.*
@@ -195,21 +233,33 @@ rm -rf %{buildroot}
 
 %{_libdir}/pkgconfig/ldb.pc
 %{_mandir}/man3/ldb*.gz
+%{_mandir}/man3/ldif*.gz
 
-%files -n pyldb
+%files -n python-ldb
 %defattr(-,root,root,-)
 %{python_sitearch}/ldb.so
 %{python_sitearch}/_ldb_text.*
 %{_libdir}/libpyldb-util.so.1*
 
-%files -n pyldb-devel
+%files -n python-ldb-devel
 %defattr(-,root,root,-)
-%{_includedir}/pyldb.h
 %{_libdir}/libpyldb-util.so
 %{_libdir}/pkgconfig/pyldb-util.pc
+
+%files -n python-ldb-devel-common
+%{_includedir}/pyldb.h
 %{_mandir}/man*/Py*.gz
 
-%if %build_compat32
+%files -n python3-ldb
+%{python3_sitearch}/ldb.cpython-*.so
+%{_libdir}/libpyldb-util.cpython-*.so.1*
+%{python3_sitearch}/_ldb_text.py
+
+%files -n python3-ldb-devel
+%{_libdir}/libpyldb-util.cpython-*.so
+%{_libdir}/pkgconfig/pyldb-util.cpython-*.pc
+
+%if %{build_compat32}
 
 %files -n compat32-%{name}
 %defattr(-,root,root,-)
@@ -225,6 +275,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.2-1
+- new upstream release.
+
+* Tue Feb 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.1-1
+- new upstream release.
+- dropped Patch1001.
+- imported Patch1 from rawhide.
+- enabled python3 modules.
+- renamed python packages.
+
 * Sat Jul 15 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.31-1
 - new upstream release.