|
|
@@ -1,4 +1,3 @@
|
|
|
-%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
%{!?python3_sitearch: %define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
|
|
|
|
|
%global with_python3 1
|
|
|
@@ -12,7 +11,7 @@
|
|
|
|
|
|
Name: lxc
|
|
|
Version: 2.0.1
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Release: 3%{?_dist_release}
|
|
|
Summary: Linux Resource Containers
|
|
|
Summary(ja): Linux リソースコンテナ
|
|
|
Group: Applications/System
|
|
|
@@ -29,6 +28,8 @@ Source12: vinelinux.userns.conf
|
|
|
Patch0: lxc-2.0.1-fix-init.patch
|
|
|
Patch1: lxc-2.0.0-remove-werror.patch
|
|
|
|
|
|
+Patch100: lxc-net-dnsmasq.patch
|
|
|
+
|
|
|
BuildRequires: docbook-utils
|
|
|
Buildrequires: docbook2X
|
|
|
Buildrequires: doxygen
|
|
|
@@ -68,6 +69,7 @@ Requires(post): chkconfig
|
|
|
Requires(preun): initscripts, chkconfig
|
|
|
Requires(postun): initscripts
|
|
|
%endif # with_systemd
|
|
|
+Obsoletes: compat32-lxc-init-static.32bit < 2.0.1-3
|
|
|
|
|
|
%description libs
|
|
|
Linux Resource Containers provide process and resource isolation without the
|
|
|
@@ -75,17 +77,6 @@ overhead of full virtualization.
|
|
|
|
|
|
The %{name}-libs package contains libraries for running %{name} applications.
|
|
|
|
|
|
-%if %{build_compat32}
|
|
|
-%package -n compat32-%{name}-init-static
|
|
|
-Summary: init command for %{name}-execute
|
|
|
-Summary(ja): %{name}-execute用initコマンド
|
|
|
-Group: Applications/System
|
|
|
-
|
|
|
-%description -n compat32-%{name}-init-static
|
|
|
-This package is init(8) needed by %{name}-execute.
|
|
|
-
|
|
|
-%endif
|
|
|
-
|
|
|
|
|
|
%if 0%{?with_python3}
|
|
|
%package -n python3-%{name}
|
|
|
@@ -181,6 +172,7 @@ This package contains documentation for %{name}.
|
|
|
%setup -q -n %{name}-%{version}
|
|
|
%patch0 -p1
|
|
|
%patch1 -p1
|
|
|
+%patch100 -p1
|
|
|
|
|
|
|
|
|
%build
|
|
|
@@ -231,9 +223,6 @@ install -m775 %{SOURCE10} %{buildroot}%{_datadir}/lxc/templates/
|
|
|
install -m775 %{SOURCE11} %{buildroot}%{_datadir}/lxc/config/
|
|
|
install -m775 %{SOURCE12} %{buildroot}%{_datadir}/lxc/config/
|
|
|
|
|
|
-%if %{build_compat32}
|
|
|
-cp %{buildroot}%{_sbindir}/init.%{name}.static %{buildroot}%{_sbindir}/init.%{name}.static-x86
|
|
|
-%endif
|
|
|
|
|
|
%check
|
|
|
make check
|
|
|
@@ -330,12 +319,6 @@ fi
|
|
|
%dir %{_localstatedir}/cache/%{name}
|
|
|
|
|
|
|
|
|
-%if %{build_compat32}
|
|
|
-%files -n compat32-%{name}-init-static
|
|
|
-%{_sbindir}/init.%{name}.static-x86
|
|
|
-%endif
|
|
|
-
|
|
|
-
|
|
|
%if 0%{?with_python3}
|
|
|
%files -n python3-%{name}
|
|
|
%{python3_sitearch}/*
|
|
|
@@ -375,6 +358,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jun 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.1-3
|
|
|
+- made lxc-net to be able to disable dnsmasq.
|
|
|
+- dropped compat32-lxc-init-static.
|
|
|
+
|
|
|
* Sun Jun 26 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.1-2
|
|
|
- enabled init.lxc.static for lxc-execute.
|
|
|
|
tomop