diff --git a/ldb.changes b/ldb.changes index ce34889..46e1ed1 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 31 22:22:49 UTC 2012 - lmuelle@suse.com + +- Define and use talloc, tdb, and tevent version macros. +- Define python_version if undefined. + ------------------------------------------------------------------- Thu May 31 13:46:42 UTC 2012 - lmuelle@suse.com diff --git a/ldb.spec b/ldb.spec index 033f001..e8519ac 100644 --- a/ldb.spec +++ b/ldb.spec @@ -17,7 +17,11 @@ # norootforbuild -#%{!?python_version: %global python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")} +%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print(get_python_version())")} + +%define talloc_version 2.0.7 +%define tdb_version 1.2.10 +%define tevent_version 0.9.15 Name: libldb1 %if 0%{?suse_version} > 1020 @@ -25,12 +29,12 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -BuildRequires: libtalloc-devel >= 2.0.7 -BuildRequires: libtdb-devel >= 1.2.10 -BuildRequires: libtevent-devel >= 0.9.15 -BuildRequires: python-tdb >= 1.2.10 +BuildRequires: libtalloc-devel >= %{talloc_version} +BuildRequires: libtdb-devel >= %{tdb_version} +BuildRequires: libtevent-devel >= %{tevent_version} +BuildRequires: python-tdb >= %{tdb_version} BuildRequires: python-devel -BuildRequires: python-tevent >= 0.9.15 +BuildRequires: python-tevent >= %{tevent_version} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} %else