From f7604dd46b7bc227848aafa8c8efeddc4e9c4aff6a6c00f929cb538ee95962f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 28 Jun 2012 16:46:14 +0000 Subject: [PATCH] Disable rpath while configure. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=10 --- talloc.changes | 5 +++++ talloc.spec | 18 +++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/talloc.changes b/talloc.changes index 3112df7..c21cf29 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 28 16:29:25 UTC 2012 - lmuelle@suse.com + +- Disable rpath while configure. + ------------------------------------------------------------------- Tue Jun 12 16:32:43 UTC 2012 - lmuelle@suse.com diff --git a/talloc.spec b/talloc.spec index b95b06f..430fd33 100644 --- a/talloc.spec +++ b/talloc.spec @@ -1,5 +1,5 @@ # -# spec file for package talloc (Version 2.0.7) +# spec file for package talloc # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,11 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: talloc %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} @@ -36,13 +34,13 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif BuildRequires: python-devel -License: LGPL-3.0+ -Group: System/Libraries Url: http://talloc.samba.org/ Version: 2.0.7 Release: 0 PreReq: /sbin/ldconfig Summary: Samba talloc Library +License: LGPL-3.0+ +Group: System/Libraries Source: http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz Source4: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,9 +54,8 @@ It is the core memory allocator used in Samba. %define libtalloc_name libtalloc2 %package -n %{libtalloc_name} -License: LGPL-3.0+ -Group: System/Libraries Summary: Libraries and Header Files to Develop Programs with talloc2 Support +Group: System/Libraries Provides: bundled(libreplace) %description -n %{libtalloc_name} @@ -71,7 +68,6 @@ This package includes the talloc2 library. %package -n libtalloc-devel -License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with talloc2 Support Group: Development/Libraries/C and C++ Requires: %{libtalloc_name} = %{version} @@ -86,7 +82,6 @@ Libraries and Header Files to Develop Programs with talloc2 Support %package -n pytalloc -License: LGPL-3.0+ Summary: Python bindings for the Talloc library Group: Development/Libraries/Python Requires: %{libtalloc_name} = %{version} @@ -96,7 +91,6 @@ This package contains the python bindings for the Talloc library. %package -n pytalloc-devel -License: LGPL-3.0+ Summary: Developer tools for the Talloc library Group: Development/Libraries/Python Requires: pytalloc = %{version} @@ -119,6 +113,7 @@ export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOU CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --libdir=%{_libdir} \ + --disable-rpath \ --bundled-libraries=NONE \ --builtin-libraries=replace \ " @@ -128,7 +123,8 @@ CONFIGURE_OPTIONS="\ doxygen doxy.config %check -%{__make} test +# make test doesn't work with --disable-rpath +#%{__make} test %install DESTDIR=${RPM_BUILD_ROOT} make install