up to 1.0.0-beta4

diff --git a/checkconfig-vserver-config.patch b/checkconfig-vserver-config.patch
index bb18ce3875b15e7b8e342f7df42577c1977386dd..f2ff97e717d49efe502afca7050b8f6d9b8d910e 100644 (file)
--- a/checkconfig-vserver-config.patch
+++ b/checkconfig-vserver-config.patch
@@ -32,12 +32,12 @@ $ zcat /proc/config.gz |grep '^# Linux'
 ---
 
 
---- lxc-0.9.0/src/lxc/lxc-checkconfig.in       2013-09-17 12:00:03.486888314 +0300
-+++ lxc-0.9.0/lxc-checkconfig  2013-09-17 12:47:12.000000000 +0300
-@@ -78,13 +68,13 @@
+--- lxc-lxc-1.0.0.beta4/src/lxc/lxc-checkconfig.in~    2014-02-07 02:19:28.000000000 +0200
++++ lxc-lxc-1.0.0.beta4/src/lxc/lxc-checkconfig.in     2014-02-13 10:52:02.174867454 +0200
+@@ -78,13 +78,13 @@
  }
  
- CGROUP_MNT_PATH=`print_cgroups cgroup /proc/self/mounts | head -1`
+ CGROUP_MNT_PATH=`print_cgroups cgroup /proc/self/mounts | head -n 1`
 -KVER_MAJOR=$($GREP '^# Linux' $CONFIG | \
 +KVER_MAJOR=$($GREP '^# Linux.*Kernel Configuration' $CONFIG | \
      sed -r 's/.* ([0-9])\.[0-9]{1,2}\.[0-9]{1,3}.*/\1/')

diff --git a/lxc.spec b/lxc.spec
index 6a2de21e8d8319aa21ceb286d8ae11d617132867..a7f72d4c694dda8697a46b6fc971e7fc78153fb3 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -10,7 +10,7 @@
 %bcond_with    selinux # SELinux
 %bcond_with    cgmanager       # Enable cgmanager (BR: libcgmanager, libnih >= 1.0.2, libnih-dbus >= 1.0.0, dbus-1 >= 1.2.16)
 
-%define                subver  beta3
+%define                subver  beta4
 %define                rel             0.1
 Summary:       Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
@@ -20,7 +20,7 @@ Release:      0.%{subver}.%{rel}
 License:       LGPL v2.1+
 Group:         Applications/System
 Source0:       https://github.com/lxc/lxc/archive/%{name}-%{version}.%{subver}.tar.gz
-# Source0-md5: b2ea21f87fa79e89990e41557d675d19
+# Source0-md5: 0758a140d451e41801588320b2192fcd
 Source1:       %{name}-pld.in.sh
 Patch1:                %{name}-pld.patch
 Patch4:                checkconfig-vserver-config.patch
@@ -205,6 +205,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/config/centos.*.conf
 %{_datadir}/%{name}/config/debian.*.conf
 %{_datadir}/%{name}/config/fedora.*.conf
+%{_datadir}/%{name}/config/gentoo.*.conf
 %{_datadir}/%{name}/config/oracle.*.conf
 %{_datadir}/%{name}/config/plamo.*.conf
 %{_datadir}/%{name}/config/ubuntu-cloud.*.conf