|
|
@@ -1,4 +1,6 @@
|
|
|
-%global with_python3 0
|
|
|
+%{!?python3_sitearch: %define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
|
|
+
|
|
|
+%global with_python3 1
|
|
|
%global with_systemd 0
|
|
|
|
|
|
%global luaver 5.1
|
|
|
@@ -6,8 +8,8 @@
|
|
|
%global luapkgdir %{_datadir}/lua/%{luaver}
|
|
|
|
|
|
Name: lxc
|
|
|
-Version: 1.1.4
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Version: 1.1.5
|
|
|
+Release: 2%{?_dist_release}
|
|
|
Summary: Linux Resource Containers
|
|
|
Summary(ja): Linux リソースコンテナ
|
|
|
Group: Applications/System
|
|
|
@@ -16,9 +18,11 @@ URL: http://linuxcontainers.org
|
|
|
|
|
|
Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
|
|
|
Source10: lxc-vinelinux
|
|
|
+Source11: vinelinux.common.conf
|
|
|
+Source12: vinelinux.userns.conf
|
|
|
|
|
|
Patch0: lxc-1.1.0-fix-init.patch
|
|
|
-Patch1: lxc-1.1.4-fix-bootorder.patch
|
|
|
+Patch1: lxc-1.1.5-disable-setproctitle-error.patch
|
|
|
|
|
|
BuildRequires: docbook-utils
|
|
|
Buildrequires: docbook2X
|
|
|
@@ -86,7 +90,7 @@ The python3-%{name} package contains the Python3 binding for %{name}.
|
|
|
Summary: Extra tools for %{name}
|
|
|
Summary(ja): %{name} の追加ツール
|
|
|
Group: Applications/System
|
|
|
-Requires: python3-%{name}%{?_isa} = %{version}-%{release}
|
|
|
+Requires: python3-%{name} = %{version}-%{release}
|
|
|
|
|
|
%description extra
|
|
|
Linux Resource Containers provide process and resource isolation without the
|
|
|
@@ -207,6 +211,8 @@ rm -rf %{buildroot}%{_datadir}/lxc/selinux
|
|
|
|
|
|
# install vinelinux template
|
|
|
install -m775 %{SOURCE10} %{buildroot}%{_datadir}/lxc/templates/
|
|
|
+install -m775 %{SOURCE11} %{buildroot}%{_datadir}/lxc/config/
|
|
|
+install -m775 %{SOURCE12} %{buildroot}%{_datadir}/lxc/config/
|
|
|
|
|
|
|
|
|
%check
|
|
|
@@ -349,6 +355,15 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Nov 17 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 1.1.5-2
|
|
|
+- enable python3 support by default
|
|
|
+
|
|
|
+* Sun Nov 15 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 1.1.5-1
|
|
|
+- update vinelinux template
|
|
|
+ - add vinelinux.{common,userns}.conf
|
|
|
+- add patch1 to disable setproctitle error message,
|
|
|
+ cherry picked from upstream git.
|
|
|
+
|
|
|
* Sun Nov 15 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 1.1.4-1
|
|
|
- update to 1.1.4-1
|
|
|
- add vinelinux template
|
daisuke