From abb034a6fcca574e33e05c923066494427183c079117e56f7ffc44372caadd67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 29 Aug 2013 10:17:31 +0000 Subject: [PATCH 1/4] Consolidate python files in the independent pyldb subpackage. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=34 --- ldb.changes | 5 +++++ ldb.spec | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ldb.changes b/ldb.changes index 0b20762..d027c3e 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 29 10:10:41 UTC 2013 - lmuelle@suse.com + +- Consolidate python files in the independent pyldb subpackage. + ------------------------------------------------------------------- Tue Jul 2 10:31:06 UTC 2013 - lmuelle@suse.com diff --git a/ldb.spec b/ldb.spec index 3244422..188aedf 100644 --- a/ldb.spec +++ b/ldb.spec @@ -87,6 +87,15 @@ Group: Development/Libraries/C and C++ Tools to manipulate ldb files +%package -n pyldb +Summary: Python bindings for the LDB library +Group: Development/Libraries/Python +Requires: %{libldb_name} = %{version} + +%description -n pyldb +This package contains the python bindings for the LDB library. + + %prep %setup -n ldb-%{version} -q @@ -124,10 +133,13 @@ DESTDIR=${RPM_BUILD_ROOT} make install %postun -n %{libldb_name} -p /sbin/ldconfig +%post -n pyldb -p /sbin/ldconfig + +%postun -n pyldb -p /sbin/ldconfig + %files -n %{libldb_name} %defattr(-,root,root) %{_libdir}/libldb.so.* -%{_libdir}/libpyldb-util.so.* %dir %{_libdir}/ldb %{_libdir}/ldb/asq.so %{_libdir}/ldb/paged_results.so @@ -152,7 +164,6 @@ DESTDIR=${RPM_BUILD_ROOT} make install %{_libdir}/libpyldb-util.so %{_libdir}/pkgconfig/ldb.pc %{_libdir}/pkgconfig/pyldb-util.pc -%{python_sitearch}/ldb.so %files -n ldb-tools %defattr(-,root,root) @@ -163,4 +174,9 @@ DESTDIR=${RPM_BUILD_ROOT} make install %{_bindir}/ldbrename %{_bindir}/ldbsearch +%files -n pyldb +%defattr(-,root,root,-) +%{python_sitearch}/ldb.so +%{_libdir}/libpyldb-util.so.* + %changelog From 420539273a40a1dfab71b7d2c1336912c6b7b8dedff6f73eaf5dfbace438bfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 29 Aug 2013 10:43:44 +0000 Subject: [PATCH 2/4] Add pyldb to baselibs.conf. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=35 --- baselibs.conf | 1 + ldb.changes | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index 1752c7e..625899c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,2 @@ libldb1 +pyldb diff --git a/ldb.changes b/ldb.changes index d027c3e..3ffda13 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Thu Aug 29 10:10:41 UTC 2013 - lmuelle@suse.com +Thu Aug 29 10:43:09 UTC 2013 - lmuelle@suse.com - Consolidate python files in the independent pyldb subpackage. +- Add pyldb to baselibs.conf. ------------------------------------------------------------------- Tue Jul 2 10:31:06 UTC 2013 - lmuelle@suse.com From 15b22a3983c2e0d9f1602dc9f31099c97dee45f54bc96e80d31b9e3cc122d7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 29 Aug 2013 11:43:46 +0000 Subject: [PATCH 3/4] Consolidate python files in independent pyldb subpackages. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=36 --- ldb.changes | 2 +- ldb.spec | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ldb.changes b/ldb.changes index 3ffda13..dc487b6 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Aug 29 10:43:09 UTC 2013 - lmuelle@suse.com -- Consolidate python files in the independent pyldb subpackage. +- Consolidate python files in independent pyldb subpackages. - Add pyldb to baselibs.conf. ------------------------------------------------------------------- diff --git a/ldb.spec b/ldb.spec index 188aedf..f940380 100644 --- a/ldb.spec +++ b/ldb.spec @@ -96,6 +96,16 @@ Requires: %{libldb_name} = %{version} This package contains the python bindings for the LDB library. +%package -n pyldb-devel +Summary: Development files for the Python bindings for the LDB library +Group: Development/Libraries/Python +Requires: pyldb = %{version} + +%description -n pyldb-devel +This package contains the development files for the Python bindings for the +LDB library. + + %prep %setup -n ldb-%{version} -q @@ -157,13 +167,10 @@ DESTDIR=${RPM_BUILD_ROOT} make install %{_includedir}/ldb_handlers.h %{_includedir}/ldb_module.h %{_includedir}/ldb_version.h -%{_includedir}/pyldb.h %{_libdir}/libldb.so %dir %{_libdir}/ldb %{_libdir}/ldb/libldb-cmdline.so -%{_libdir}/libpyldb-util.so %{_libdir}/pkgconfig/ldb.pc -%{_libdir}/pkgconfig/pyldb-util.pc %files -n ldb-tools %defattr(-,root,root) @@ -179,4 +186,10 @@ DESTDIR=${RPM_BUILD_ROOT} make install %{python_sitearch}/ldb.so %{_libdir}/libpyldb-util.so.* +%files -n pyldb-devel +%defattr(-,root,root,-) +%{_includedir}/pyldb.h +%{_libdir}/libpyldb-util.so +%{_libdir}/pkgconfig/pyldb-util.pc + %changelog From 7b616927139323f50137159aafbaef4c9a6237756192fab30abb57ccfd5dc8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 29 Aug 2013 11:47:32 +0000 Subject: [PATCH 4/4] PreReq ldconfig from pyldb as we us it in %post and %postun. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=37 --- ldb.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ldb.spec b/ldb.spec index f940380..d85f1a7 100644 --- a/ldb.spec +++ b/ldb.spec @@ -91,6 +91,7 @@ Tools to manipulate ldb files Summary: Python bindings for the LDB library Group: Development/Libraries/Python Requires: %{libldb_name} = %{version} +PreReq: /sbin/ldconfig %description -n pyldb This package contains the python bindings for the LDB library.