From f986d67bde667f5d5e98454aed35972b8af13aff420ab9a037698f175187d1e6 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Mon, 9 Oct 2017 08:50:09 +0000 Subject: [PATCH] Accepting request 532688 from home:jmcdough:branches:network:samba:STABLE use library name directly instead of variable to pass osc source validation OBS-URL: https://build.opensuse.org/request/show/532688 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=99 --- talloc.changes | 6 ++++++ talloc.spec | 21 ++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/talloc.changes b/talloc.changes index 72eef19..5710c26 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 9 06:55:51 UTC 2017 - jmcdonough@suse.com + +- Reference library name directly instead of using variables to + pass obs source validator. + ------------------------------------------------------------------- Mon Oct 2 12:18:30 UTC 2017 - jengelh@inai.de diff --git a/talloc.spec b/talloc.spec index 3d12018..e97d958 100644 --- a/talloc.spec +++ b/talloc.spec @@ -61,17 +61,12 @@ 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} +%package -n libtalloc2 Summary: Samba talloc library Group: System/Libraries Provides: bundled(libreplace) -%description -n %{libtalloc_name} +%description -n libtalloc2 Talloc is a hierarchical, reference counted memory pool system with destructors. @@ -87,7 +82,7 @@ Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1030 Recommends: %{name}-man %endif -Requires: %{libtalloc_name} = %{version} +Requires: libtalloc2 = %{version} Requires: pkg-config %description -n libtalloc-devel @@ -102,7 +97,7 @@ Libraries and Header Files to Develop Programs with talloc2 Support. %package -n python-talloc Summary: Python bindings for the Talloc library Group: Development/Libraries/Python -Requires: %{libtalloc_name} = %{version} +Requires: libtalloc2 = %{version} Provides: pytalloc = %{version} Obsoletes: pytalloc < %{version} @@ -125,7 +120,7 @@ Libraries and Header Files to Develop Programs with python-talloc Support %package -n python3-talloc Summary: Python3 bindings for the Talloc library Group: Development/Libraries/Python -Requires: %{libtalloc_name} = %{version} +Requires: libtalloc2 = %{version} %description -n python3-talloc This package contains the Python3 bindings for the Talloc library. @@ -198,9 +193,9 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %endif # ! build_man %if ! %{build_man} -%post -n %{libtalloc_name} -p /sbin/ldconfig +%post -n libtalloc2 -p /sbin/ldconfig -%postun -n %{libtalloc_name} -p /sbin/ldconfig +%postun -n libtalloc2 -p /sbin/ldconfig %post -n python-talloc -p /sbin/ldconfig @@ -210,7 +205,7 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %postun -n python3-talloc -p /sbin/ldconfig -%files -n %{libtalloc_name} +%files -n libtalloc2 %defattr(-,root,root) %{_libdir}/libtalloc.so.*