From a36ba58be4fd77fb029316aefffeaae52d25e68b Mon Sep 17 00:00:00 2001
From: zbyniu <zbyniu@pld-linux.org>
Date: Tue, 27 May 2008 08:20:27 +0000
Subject: [PATCH] - up to 20080527; fixes.patch and spin_lock.patch added,
 disable-security_inode_permission.patch restored

Changed files:
    aufs.spec -> 1.25
---
 aufs.spec | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/aufs.spec b/aufs.spec
index 1533698..01027e0 100644
--- a/aufs.spec
+++ b/aufs.spec
@@ -1,4 +1,7 @@
 #
+# TODO:
+# - define CONFIG_ option directly
+#
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
@@ -9,7 +12,7 @@
 %undefine	with_dist_kernel
 %endif
 
-%define		subver		20080517
+%define		subver		20080527
 %define		prel		0.%{subver}.%{rel}
 
 %define		rel		1
@@ -23,6 +26,9 @@ Group:		Base/Kernel
 Source0:	%{name}-%{subver}.tar.bz2
 # Source0-md5:	61a932836cdb0f34e9aed6a6a6697547
 Patch0:		%{name}-vserver.patch
+Patch1:		%{name}-disable-security_inode_permission.patch
+Patch2:		%{name}-fixes.patch
+Patch3:		%{name}-spin_lock.patch
 URL:		http://aufs.sourceforge.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.25.2}
@@ -73,6 +79,9 @@ Ten pakiet zawiera moduł jądra Linuksa.
 %prep
 %setup -qn %{name}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 sed '
 	s/$(CONFIG_AUFS)/m/; 
@@ -81,15 +90,16 @@ sed '
 	s/$(CONFIG_AUFS_EXPORT)/y/;
 	s/$(CONFIG_AUFS_SYSAUFS)/n/
 ' -i fs/aufs/Makefile
-cp -a include/linux fs/aufs
+cp -a include/linux fs/aufs25
 
 %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=" \
+export CONFIG_AUFS_BR_XFS=y
+%build_kernel_modules -C fs/aufs25 -m aufs \
+	EXTRA_CFLAGS+=" \
 		-DCONFIG_AUFS_BRANCH_MAX_127 \
 		-DCONFIG_AUFS_BRANCH_MAX_CHAR \
 		-DCONFIG_AUFS_FAKE_DM \
@@ -116,7 +126,7 @@ install util/aufs.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m fs/aufs/aufs -d kernel/fs/aufs
+%install_kernel_modules -m fs/aufs25/aufs -d kernel/fs/aufs
 %endif
 
 %clean
-- 
2.43.0