From 08e37c0ba8f842e3bbd582052cefc166db06d012 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 10 Jun 2017 14:21:54 +0200 Subject: [PATCH] Fix bash completion on epel6 (rhbz#1408173). --- lxc-fix-bash-completion.patch | 10 ++++++++++ lxc.spec | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 lxc-fix-bash-completion.patch diff --git a/lxc-fix-bash-completion.patch b/lxc-fix-bash-completion.patch new file mode 100644 index 0000000..fcbdaa4 --- /dev/null +++ b/lxc-fix-bash-completion.patch @@ -0,0 +1,10 @@ +diff --git b/config/bash/lxc.in a/config/bash/lxc.in +index 344d5cb..cbd1b79 100644 +--- b/config/bash/lxc.in ++++ a/config/bash/lxc.in +@@ -1,4 +1,4 @@ +-_have lxc-start && { ++have lxc-start && { + _lxc_names() { + COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) + } diff --git a/lxc.spec b/lxc.spec index 9b4ffd5..9d0fbd0 100644 --- a/lxc.spec +++ b/lxc.spec @@ -44,6 +44,7 @@ Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz Patch0: lxc-2.0.7-fix-init.patch Patch1: lxc-2.0.6-fix-lxc-net.patch Patch2: lxc-2.0.8-fix_capability_h.patch +Patch3: lxc-fix-bash-completion.patch BuildRequires: docbook2X BuildRequires: doxygen BuildRequires: kernel-headers @@ -178,10 +179,12 @@ This package contains documentation for %{name}. %setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}} %patch0 -p1 %patch1 -p1 -%if 0%{?rhel} == 6 +%if 0%{?rhel} <= 6 # fix build failure with broken sys/capabilities.h (see # e.g. rhbz#483548) %patch2 -p1 +# revert 3db8dd39 (see rhbz#1408173) +%patch3 -p1 %endif @@ -384,6 +387,7 @@ fi %changelog * Sat Jun 10 2017 Thomas Moschny - 2.0.8-2 - Fix for EL6 build failure. +- Fix bash completion on epel6 (rhbz#1408173). * Tue Jun 6 2017 Thomas Moschny - 2.0.8-1 - Update to 2.0.8.