Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2020-02-04 19:52:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc" Tue Feb 4 19:52:35 2020 rev:90 rq:769648 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2019-11-18 20:09:15.181626814 +0100 +++ /work/SRC/openSUSE:Factory/.lxc.new.26092/lxc.changes 2020-02-04 19:53:00.397309469 +0100 @@ -1,0 +2,12 @@ +Mon Feb 3 14:54:13 UTC 2020 - Dominique Leuenberger <[email protected]> + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut through the -mini flavors. + +------------------------------------------------------------------- +Sun Feb 2 12:48:21 UTC 2020 - Aleksa Sarai <[email protected]> + +- Fix bash-completion paths to match the binary names (and to avoid conflicts + with LXD). boo#1162426 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.x7GBpB/_old 2020-02-04 19:53:01.405310057 +0100 +++ /var/tmp/diff_new_pack.x7GBpB/_new 2020-02-04 19:53:01.405310057 +0100 @@ -66,12 +66,12 @@ BuildRequires: docbook-utils BuildRequires: docbook2x BuildRequires: bash-completion -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) Requires: libcap-progs Requires: lxcfs Requires: lxcfs-hooks-lxc Requires: rsync -%{?systemd_requires} +%{?systemd_ordering} # Needed to create openSUSE containers using template. Recommends: build Recommends: criu >= 2.0 @@ -179,10 +179,15 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-net -# Ensure we install the bash-completion to the correct place -- on some SLE -# versions this is done for us by make_install, on others we need to do it -# manually. -install -D -m 0644 config/bash/lxc %{buildroot}%{_datadir}/bash-completion/completions/%{name} +# Install bash-completion. Note that we have to install a symlink for every +# lxc-* command because bash-completion relies on the binary name to pick the +# bash-completion script. +install -D -m 0644 config/bash/lxc %{buildroot}%{_datadir}/bash-completion/completions/_%{name} +for bin in $(find src/lxc/lxc-* -executable -print0 | xargs -n1 -0 basename) +do + ln -s "_%{name}" "%{buildroot}%{_datadir}/bash-completion/completions/$bin" +done +# lxc installs bash-completion to the wrong location. rm -f %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} # Clean up.
