From 3bf81ab2425f9b456e00cd064f36695895000bf0 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 3 Dec 2016 17:04:07 +0100 Subject: [PATCH] Update to 2.0.6. --- lxc-2.0.1-fix-init.patch | 2 +- lxc.spec | 21 ++++++++++++++------- sources | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lxc-2.0.1-fix-init.patch b/lxc-2.0.1-fix-init.patch index 343c22c..d0bd513 100644 --- a/lxc-2.0.1-fix-init.patch +++ b/lxc-2.0.1-fix-init.patch @@ -38,7 +38,7 @@ diff -up lxc-2.0.1/config/init/sysvinit/lxc-net.in.orig lxc-2.0.1/config/init/sy # Should-Start: # Should-Stop: -# Default-Start: 2 3 4 5 --# Default-Stop: 1 +-# Default-Stop: 0 1 6 +# Default-Start: +# Default-Stop: # Short-Description: Bring up/down LXC Network Bridge diff --git a/lxc.spec b/lxc.spec index 0f5cd80..f5ecff3 100644 --- a/lxc.spec +++ b/lxc.spec @@ -30,7 +30,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: lxc -Version: 2.0.5 +Version: 2.0.6 Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist} Summary: Linux Resource Containers Group: Applications/System @@ -58,6 +58,9 @@ BuildRequires: pkgconfig(python3) >= 3.2 %if 0%{?with_systemd} BuildRequires: systemd %endif # with_systemd +%if 0%{?fedora} || 0%{?rhel} >= 7 +BuildRequires: pkgconfig(bash-completion) +%endif # lxc-extra subpackage not needed anymore, lxc-ls has been rewriten in # C and does not depend on the Python3 binding anymore Provides: lxc-extra = %{version}-%{release} @@ -203,6 +206,11 @@ This package contains documentation for %{name}. %endif # with_systemd --disable-werror \ # intentionally blank line + +# fix rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + %{make_build} @@ -219,12 +227,8 @@ cp -a doc/api/html/* %{buildroot}%{_pkgdocdir}/api/ # cache dir mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} -# on Fedora and EPEL>=7, move the completion file to %%{_datadir} -%if 0%{?fedora} || 0%{?rhel} >= 7 -install -d %{buildroot}%{_datadir}/bash-completion/completions/ -mv %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} \ - %{buildroot}%{_datadir}/bash-completion/completions/%{name} -%endif +# remove libtool .la file +rm -rf %{buildroot}%{_libdir}/liblxc.la %check @@ -370,6 +374,9 @@ fi %changelog +* Sat Dec 3 2016 Thomas Moschny - 2.0.6-1 +- Update to 2.0.6. + * Wed Oct 5 2016 Thomas Moschny - 2.0.5-1 - Update to 2.0.5. diff --git a/sources b/sources index 1789328..1e9a2e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59792f085be451b8cf336d86ac335123 lxc-2.0.5.tar.gz +5fd4b7af8026e8ae20b3065ee18fe974 lxc-2.0.6.tar.gz