From 967bc7599346cfd41152be92d1c025909b8179a3c98100e480a0f6643789d675 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sun, 9 Jun 2019 06:45:04 +0000 Subject: [PATCH] Accepting request 706916 from home:jengelh:branches:Virtualization:containers - Trim filler wording from description. - Remove --with-pic which often has no point with --disable-static. - Avoid bash-specific sh code. OBS-URL: https://build.opensuse.org/request/show/706916 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/lxd?expand=0&rev=10 --- lxd.changes | 7 +++++++ lxd.spec | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lxd.changes b/lxd.changes index d856e89..31eb693 100644 --- a/lxd.changes +++ b/lxd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jun 2 17:22:35 UTC 2019 - Jan Engelhardt + +- Trim filler wording from description. +- Remove --with-pic which often has no point with --disable-static. +- Avoid bash-specific sh code. + ------------------------------------------------------------------- Thu May 9 20:28:55 UTC 2019 - Aleksa Sarai diff --git a/lxd.spec b/lxd.spec index eddfff1..e1fad43 100644 --- a/lxd.spec +++ b/lxd.spec @@ -66,8 +66,8 @@ Recommends: btrfsprogs Suggests: zfs %description -LXD is a next generation system container manager. It offers a user experience -similar to virtual machines but using Linux containers (LXC) instead. +LXD is a system container manager. It offers a user experience +similar to virtual machines but uses Linux containers (LXC) instead. %package bash-completion Summary: Bash Completion for %{name} @@ -123,8 +123,7 @@ export LDFLAGS="-L$PWD/../sqlite/.libs/" autoreconf -fiv %configure \ --libdir="%{_libdir}/%{name}" \ - --disable-static \ - --with-pic + --disable-static make clean make %{?_smp_mflags} ) @@ -143,7 +142,7 @@ do binary="$(basename "$mainpkg")" ( # We need to link against sqlite and dqlite only when dealing with lxd proper. - [[ "$binary" == "lxd" ]] && export \ + [ "$binary" == "lxd" ] && export \ BUILDTAGS="libsqlite3" \ CGO_CFLAGS="%{optflags} -I$PKGDIR/dist/sqlite/ -I$PKGDIR/dist/dqlite/include/" \ CGO_LDFLAGS="-L$PKGDIR/dist/sqlite/.libs/ -L$PKGDIR/dist/dqlite/.libs/" \