up to 1.0.0 release!

diff --git a/checkconfig-vserver-config.patch b/checkconfig-vserver-config.patch
deleted file mode 100644 (file)
index f2ff97e..0000000
--- a/checkconfig-vserver-config.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Upstream tracker: https://sourceforge.net/p/lxc/bugs/75/
-
-the variables get assigned as:
-KVER_MAJOR="3\n# Linux VServer"
-KVER_MINOR="10\n# Linux VServer"
-
-which causes parse errors:
-
-Cgroup memory controller: 
-+ '[' 3 '#' Linux VServer -ge 3 -a 10 '#' Linux VServer -ge 6 ']'
-/usr/bin/lxc-checkconfig[98]: [: #: unexpected operator/operand
-+ is_enabled CONFIG_CGROUP_MEM_RES_CTLR
-
-in this code:
-if [ $KVER_MAJOR -ge 3 -a $KVER_MINOR -ge 6 ]; then
-    is_enabled CONFIG_MEMCG
-else
-    is_enabled CONFIG_CGROUP_MEM_RES_CTLR
-fi
-
-
----
-$ zgrep '^# Linux' /proc/config.gz | sed -r 's/.* ([0-9])\.[0-9]{1,2}\.[0-9]{1,3}.*/\1/'
-3
-# Linux VServer
----
-
-$ zcat /proc/config.gz |grep '^# Linux'
----
-# Linux/x86_64 3.10.10 Kernel Configuration
-# Linux VServer
----
-
-
---- 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 -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/')
- if [ "$KVER_MAJOR" = "2" ]; then
--KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
-+KVER_MINOR=$($GREP '^# Linux.*Kernel Configuration' $CONFIG | \
-     sed -r 's/.* 2.6.([0-9]{2}).*/\1/')
- else
--KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
-+KVER_MINOR=$($GREP '^# Linux.*Kernel Configuration' $CONFIG | \
-     sed -r 's/.* [0-9]\.([0-9]{1,3})\.[0-9]{1,3}.*/\1/')
- fi
- 

diff --git a/lxc.spec b/lxc.spec
index a7f72d4c694dda8697a46b6fc971e7fc78153fb3..baf547967509974d8193dfefbdf32596ef13ee21 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -10,20 +10,17 @@
 %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  beta4
-%define                rel             0.1
 Summary:       Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
 Name:          lxc
 Version:       1.0.0
-Release:       0.%{subver}.%{rel}
+Release:       0.2
 License:       LGPL v2.1+
 Group:         Applications/System
-Source0:       https://github.com/lxc/lxc/archive/%{name}-%{version}.%{subver}.tar.gz
-# Source0-md5: 0758a140d451e41801588320b2192fcd
+Source0:       http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
+# Source0-md5: 87a9d168a6e55326303cce3b2cb7f82e
 Source1:       %{name}-pld.in.sh
 Patch1:                %{name}-pld.patch
-Patch4:                checkconfig-vserver-config.patch
 URL:           http://linuxcontainers.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -107,9 +104,8 @@ Python (3.x) binding for LXC.
 Wiązanie Pythona (3.x) do LXC.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}%{?subver:.%{subver}}
+%setup -q
 %patch1 -p1
-%patch4 -p1
 
 cp -p %{SOURCE1} templates/lxc-pld.in
 
@@ -131,6 +127,7 @@ cp -p %{SOURCE1} templates/lxc-pld.in
        %{__enable_disable selinux} \
        --with-config-path=%{configpath} \
        --with-init-script=sysvinit,systemd \
+       --with-runtime-path=/var/run \
        --with-distro=pld
 
 %{__make}