From a64436d15e5af8f50056d2db0c2495e894421fe8483cf89fb6c44dbd4319bff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 21 Feb 2016 19:22:47 +0000 Subject: [PATCH] Accepting request 360743 from home:lmuelle:bsc966174 Avoid a file collision for non SUSE build targets; (bsc#966174). OBS-URL: https://build.opensuse.org/request/show/360743 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=97 --- ldb.changes | 5 +++++ ldb.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ldb.changes b/ldb.changes index 9eb6de9..774e195 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 21 16:55:27 UTC 2016 - lmuelle@suse.com + +- Avoid a file collision for non SUSE build targets; (bsc#966174). + ------------------------------------------------------------------- Wed Feb 17 18:04:54 UTC 2016 - lmuelle@suse.com diff --git a/ldb.spec b/ldb.spec index dad80bb..5c48672 100644 --- a/ldb.spec +++ b/ldb.spec @@ -31,7 +31,6 @@ Name: ldb BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen -#!BuildIgnore: libtalloc BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: libtevent-devel >= %{tevent_version} @@ -65,7 +64,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Ldb is an LDAP-like embedded database. +%if 0%{?suse_version} > 0 %define libldb_name libldb1 +%else +%define libldb_name libldb +%endif %package -n %{libldb_name} Summary: An LDAP-like embedded database Group: System/Libraries