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] 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