lxc-3.0.3-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12019 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lxc/lxc-vl.spec

@@ -1,6 +1,5 @@
-%{!?python3_sitearch: %define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%bcond_with lua
-
+%global with_python3 0
-%global with_python3 1
 %global with_systemd 0
 
 %global luaver 5.1
@@ -10,8 +9,8 @@
 %define _unpackaged_files_terminate_build 1
 
 Name:           lxc
-Version:        2.0.8
+Version:        3.0.3
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:        Linux Resource Containers
 Summary(ja):    Linux リソースコンテナ
 Group:          Applications/System
@@ -25,10 +24,8 @@ Source10:	lxc-vinelinux
 Source11:	vinelinux.common.conf
 Source12:	vinelinux.userns.conf
 
-Patch0:         lxc-2.0.8-fix-init.patch
+Patch0:         0001-fix-initscript.patch
-#Patch1:         lxc-2.0.0-remove-werror.patch
+Patch100:       0002-fix-launching-dnsmasq.patch
-
-Patch100:       lxc-net-dnsmasq.patch
 
 BuildRequires:  docbook-utils
 Buildrequires:  docbook2X
@@ -38,17 +35,26 @@ BuildRequires:  glibc-static
 BuildRequires:  kernel-headers
 BuildRequires:  libcap-static
 BuildRequires:  libtool
+%if %{with lua}
 BuildRequires:  lua-devel
+%endif
 BuildRequires:  perl-XML-SAX
 %if 0%{?with_python3}
 BuildRequires:  python3-devel >= 3.2
+BuildRequires:  python3-rpm-macros
 %endif # with_python3
 %if 0%{?with_systemd}
 BuildRequires:  systemd
 %endif # with_systemd
 # for lxc-top
+%if %{with lua}
 Requires:       lua-%{name}%{?_isa} = %{version}-%{release}
 Requires:       lua-alt-getopt
+%endif
+Requires:       libcgroup
+Obsoletes:      lxc-extra < 3.0.0
+Obsoletes:      lxc-lua < 3.0.0
+Obsoletes:      python3-lxc < 3.0.0
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
@@ -108,6 +114,7 @@ This package contains tools needing the Python3 bindings.
 %endif # with_python3
 
 
+%if %{with lua}
 %package        -n lua-%{name}
 Summary:        Lua binding for %{name}
 Summary(ja):    %{name} の Lua バインディング
@@ -119,6 +126,8 @@ overhead of full virtualization.
 
 The lua-%{name} package contains the Lua binding for %{name}.
 
+%endif
+
 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}core\\.so\\.0
 
 
@@ -191,7 +200,9 @@ This package contains documentation for %{name}.
            --enable-capabilities \
            --enable-examples \
            --enable-bash \
+%if %{with lua}
            --enable-lua \
+%endif
 %if 0%{?with_python3}
            --enable-python \
 %endif # with_python3
@@ -208,7 +219,9 @@ make %{?_smp_mflags}
 %{make_install}
 make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+%if %{with lua}
 chmod -x %{buildroot}%{luapkgdir}/lxc.lua
+%endif
 
 mkdir -p %{buildroot}%{_pkgdocdir}
 cp -a AUTHORS COPYING README %{buildroot}%{_pkgdocdir}
@@ -225,7 +238,7 @@ install -m775 %{SOURCE10} %{buildroot}%{_datadir}/lxc/templates/
 install -m775 %{SOURCE11} %{buildroot}%{_datadir}/lxc/config/
 install -m775 %{SOURCE12} %{buildroot}%{_datadir}/lxc/config/
 
-rm -f %{buildroot}%{_libdir}/liblxc.la
+rm -f %{buildroot}%{_libdir}/liblxc.{a,la}
 
 
 %check
@@ -264,6 +277,8 @@ fi
 
 
 %files
+%license COPYING
+%doc README*
 %{_bindir}/%{name}-*
 %{_mandir}/man1/%{name}*
 %{_mandir}/*/man1/%{name}*
@@ -338,9 +353,11 @@ fi
 %endif # with_python3
 
 
+%if %{with lua}
 %files -n lua-%{name}
 %{lualibdir}/%{name}
 %{luapkgdir}/%{name}.lua
+%endif
 
 
 %files templates
@@ -362,6 +379,14 @@ fi
 
 
 %changelog
+* Fri Jan 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.3-1
+- updated to 3.0.3.
+- updated Patch0.
+- updated Patch100.
+- disabled lua.
+- disabled python.
+- added R:libcgroup.
+
 * Wed Aug 30 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.8-2
 - enabled cgmanager.