From dd9fb61b6255bc0b3e85cf0d4e263b31c0eaf179 Mon Sep 17 00:00:00 2001
From: zbyniu <zbyniu@pld-linux.org>
Date: Wed, 19 Mar 2008 14:59:21 +0000
Subject: [PATCH] - vserver bcond removed, autodetection

Changed files:
    aufs.spec -> 1.21
---
 aufs.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aufs.spec b/aufs.spec
index e6ee133..5efdd7d 100644
--- a/aufs.spec
+++ b/aufs.spec
@@ -4,7 +4,6 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
-%bcond_without	vserver		# kernel build without vserver & grsecurity
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -74,9 +73,7 @@ Ten pakiet zawiera moduł jądra Linuksa.
 
 %prep
 %setup -qn %{name}
-%if %{with vserver}
 %patch0 -p1
-%endif
 %patch1 -p1
 
 sed '
@@ -90,6 +87,9 @@ cp -a include/linux fs/aufs
 
 %build
 %if %{with kernel}
+if [ -f %{_kernelsrcdir}/include/linux/vs_base.h ]; then
+	isvserver="-DVSERVER"
+fi
 %build_kernel_modules -C fs/aufs -m aufs \
 	EXTRA_CFLAGS=" \
 		-DCONFIG_AUFS_BRANCH_MAX_127 \
@@ -99,7 +99,7 @@ cp -a include/linux fs/aufs
 		-UCONFIG_AUFS_KSIZE_PATCH \
 		-UCONFIG_AUFS_DLGT \
 		%{?debug:-DCONFIG_AUFS_DEBUG} \
-		%{?with_vserver:-DVSERVER}"
+		$isvserver"
 %endif
 
 %if %{with userspace}
-- 
2.44.0