From 2b65e9039246e4f739020b538847dd91cacd91867d8000efba346d73a0173ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 22 Oct 2015 21:50:20 +0000 Subject: [PATCH 1/5] Accepting request 340502 from home:lmuelle:pysamba Rename pyldb to python-ldb. OBS-URL: https://build.opensuse.org/request/show/340502 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=74 --- baselibs.conf | 2 +- ldb.changes | 5 +++++ ldb.spec | 30 +++++++++++++++++------------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 625899c..e1d1710 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ libldb1 -pyldb +python-ldb diff --git a/ldb.changes b/ldb.changes index acf4731..7e94d82 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 22 20:52:14 UTC 2015 - lmuelle@suse.com + +- Rename pyldb to python-ldb. + ------------------------------------------------------------------- Mon Sep 7 21:55:16 UTC 2015 - lmuelle@suse.com diff --git a/ldb.spec b/ldb.spec index 8b4c5ab..df55a68 100644 --- a/ldb.spec +++ b/ldb.spec @@ -18,9 +18,9 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define talloc_version 2.0.8 -%define tdb_version 1.3.4 -%define tevent_version 0.9.17 +%define talloc_version 2.1.4 +%define tdb_version 1.3.7 +%define tevent_version 0.9.25 Name: ldb BuildRequires: docbook-xsl-stylesheets @@ -30,8 +30,8 @@ BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: libtevent-devel >= %{tevent_version} BuildRequires: libxslt BuildRequires: popt-devel -BuildRequires: pytalloc-devel >= %{talloc_version} BuildRequires: python-devel +BuildRequires: python-talloc-devel >= %{talloc_version} BuildRequires: python-tdb >= %{tdb_version} BuildRequires: python-tevent >= %{tevent_version} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 @@ -91,27 +91,31 @@ Group: Development/Libraries/C and C++ Tools to manipulate ldb files -%package -n pyldb +%package -n python-ldb Summary: Python bindings for the LDB library Group: Development/Libraries/Python Requires: %{libldb_name} = %{version} PreReq: /sbin/ldconfig +Provides: pyldb = %{version} +Obsoletes: pyldb < %{version} -%description -n pyldb +%description -n python-ldb This package contains the python bindings for the LDB library. -%package -n pyldb-devel +%package -n python-ldb-devel Summary: Development files for the Python bindings for the LDB library Group: Development/Libraries/Python -Requires: pyldb = %{version} +Requires: python-ldb = %{version} %if 0%{?suse_version} > 1020 Requires: pkg-config %else Requires: pkgconfig %endif +Provides: pyldb-devel = %{version} +Obsoletes: pyldb-devel < %{version} -%description -n pyldb-devel +%description -n python-ldb-devel This package contains the development files for the Python bindings for the LDB library. @@ -153,9 +157,9 @@ DESTDIR=${RPM_BUILD_ROOT} make install %postun -n %{libldb_name} -p /sbin/ldconfig -%post -n pyldb -p /sbin/ldconfig +%post -n python-ldb -p /sbin/ldconfig -%postun -n pyldb -p /sbin/ldconfig +%postun -n python-ldb -p /sbin/ldconfig %files -n %{libldb_name} %defattr(-,root,root) @@ -198,12 +202,12 @@ DESTDIR=${RPM_BUILD_ROOT} make install %{_mandir}/man1/ldbsearch.1.gz %{_mandir}/man3/ldb.3.gz -%files -n pyldb +%files -n python-ldb %defattr(-,root,root,-) %{python_sitearch}/ldb.so %{_libdir}/libpyldb-util.so.* -%files -n pyldb-devel +%files -n python-ldb-devel %defattr(-,root,root,-) %{_includedir}/pyldb.h %{_libdir}/libpyldb-util.so From 954d9419bd8647ad3bf8c7ecd7d6bb029954b6c2867a384911889ed0586c9305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 25 Oct 2015 21:11:38 +0000 Subject: [PATCH 2/5] Obsolete pyldb from baselibs.conf too OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=75 --- baselibs.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/baselibs.conf b/baselibs.conf index e1d1710..a42c4e2 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,3 @@ libldb1 python-ldb + obsoletes "pyldb- < " From 7f75e83a5de480aafba2a097195fab65f8d33f2f7fb3b1f001efce35a38ad245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 26 Oct 2015 10:15:56 +0000 Subject: [PATCH 3/5] Add release to the obsoletes lines Else we can't update as the version wasn't bumped OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=76 --- ldb.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ldb.spec b/ldb.spec index df55a68..72d3a2e 100644 --- a/ldb.spec +++ b/ldb.spec @@ -97,7 +97,7 @@ Group: Development/Libraries/Python Requires: %{libldb_name} = %{version} PreReq: /sbin/ldconfig Provides: pyldb = %{version} -Obsoletes: pyldb < %{version} +Obsoletes: pyldb < %{version}-%{release} %description -n python-ldb This package contains the python bindings for the LDB library. @@ -113,7 +113,7 @@ Requires: pkg-config Requires: pkgconfig %endif Provides: pyldb-devel = %{version} -Obsoletes: pyldb-devel < %{version} +Obsoletes: pyldb-devel < %{version}-%{release} %description -n python-ldb-devel This package contains the development files for the Python bindings for the From 3fa8309e23d135905ea6dc1ca01d5dd7d68711763b37deb46f9753b89d7c2633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 26 Oct 2015 13:17:23 +0000 Subject: [PATCH 4/5] Add missing - to obsoletes pyldb OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=77 --- baselibs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index a42c4e2..34cb61c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ libldb1 python-ldb - obsoletes "pyldb- < " + obsoletes "pyldb- < -" From 82e54a4e5c520f85c8b6455cdb7144e40e22fa297cad32f5af0244946af77782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 26 Oct 2015 13:43:08 +0000 Subject: [PATCH 5/5] Add .0 suffix to the version and revert the previous - addition to baselibs.conf Instead we add a .0 suffux to the version OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=78 --- baselibs.conf | 2 +- ldb.spec | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 34cb61c..a42c4e2 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ libldb1 python-ldb - obsoletes "pyldb- < -" + obsoletes "pyldb- < " diff --git a/ldb.spec b/ldb.spec index 72d3a2e..8f98835 100644 --- a/ldb.spec +++ b/ldb.spec @@ -22,6 +22,9 @@ %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 #!BuildIgnore: libtalloc @@ -40,13 +43,13 @@ BuildRequires: python-tevent >= %{tevent_version} %define build_make_smp_mflags %{?jobs:-j%jobs} %endif Url: http://ldb.samba.org/ -Version: 1.1.21 +Version: %{ldb_version}.0 Release: 0 Summary: An LDAP-like embedded database License: GPL-3.0+ Group: System/Libraries -Source: http://download.samba.org/pub/ldb/ldb-%{version}.tar.gz -Source1: http://download.samba.org/pub/ldb/ldb-%{version}.tar.asc +Source: http://download.samba.org/pub/ldb/ldb-%{ldb_version}.tar.gz +Source1: http://download.samba.org/pub/ldb/ldb-%{ldb_version}.tar.asc Source2: ldb.keyring Source4: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -97,7 +100,7 @@ Group: Development/Libraries/Python Requires: %{libldb_name} = %{version} PreReq: /sbin/ldconfig Provides: pyldb = %{version} -Obsoletes: pyldb < %{version}-%{release} +Obsoletes: pyldb < %{version} %description -n python-ldb This package contains the python bindings for the LDB library. @@ -113,7 +116,7 @@ Requires: pkg-config Requires: pkgconfig %endif Provides: pyldb-devel = %{version} -Obsoletes: pyldb-devel < %{version}-%{release} +Obsoletes: pyldb-devel < %{version} %description -n python-ldb-devel This package contains the development files for the Python bindings for the @@ -121,7 +124,7 @@ LDB library. %prep -%setup -n ldb-%{version} -q +%setup -n ldb-%{ldb_version} -q %build %if 0%{?suse_version} && 0%{?suse_version} < 911