From 2749d40b4e4630c252f9b45ac2eaa3d7eef16bda5d3ec22e1635e365ff3183aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 21 Feb 2016 19:22:10 +0000 Subject: [PATCH] Accepting request 360745 from home:lmuelle:bsc966174 Avoid a file collision for non SUSE build targets; (bsc#966174). OBS-URL: https://build.opensuse.org/request/show/360745 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=72 --- talloc-man.changes | 5 +++++ talloc-man.spec | 6 +++++- talloc.changes | 5 +++++ talloc.spec | 6 +++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/talloc-man.changes b/talloc-man.changes index 0b64e83..e17a1fb 100644 --- a/talloc-man.changes +++ b/talloc-man.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 21 16:44:01 UTC 2016 - lmuelle@suse.com + +- Avoid a file collision for non SUSE build targets; (bsc#966174). + ------------------------------------------------------------------- Wed Nov 11 17:49:37 UTC 2015 - lmuelle@suse.com diff --git a/talloc-man.spec b/talloc-man.spec index 162ec4b..b2d359a 100644 --- a/talloc-man.spec +++ b/talloc-man.spec @@ -1,7 +1,7 @@ # # spec file for package talloc-man # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -72,7 +72,11 @@ It is the core memory allocator used in Samba. %if ! %{build_man} +%if 0%{?suse_version} > 0 %define libtalloc_name libtalloc2 +%else +%define libtalloc_name libtalloc +%endif %package -n %{libtalloc_name} Summary: Libraries and Header Files to Develop Programs with talloc2 Support Group: System/Libraries diff --git a/talloc.changes b/talloc.changes index 0b64e83..e17a1fb 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 21 16:44:01 UTC 2016 - lmuelle@suse.com + +- Avoid a file collision for non SUSE build targets; (bsc#966174). + ------------------------------------------------------------------- Wed Nov 11 17:49:37 UTC 2015 - lmuelle@suse.com diff --git a/talloc.spec b/talloc.spec index d6b2ca9..3300669 100644 --- a/talloc.spec +++ b/talloc.spec @@ -1,7 +1,7 @@ # # spec file for package talloc-man # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -72,7 +72,11 @@ It is the core memory allocator used in Samba. %if ! %{build_man} +%if 0%{?suse_version} > 0 %define libtalloc_name libtalloc2 +%else +%define libtalloc_name libtalloc +%endif %package -n %{libtalloc_name} Summary: Libraries and Header Files to Develop Programs with talloc2 Support Group: System/Libraries