X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=aufs.spec;h=ba1f2a46b78c19b024c5a1e0fefde691cea97962;hb=HEAD;hp=a02de696aaa66357cc780ab69a91cc4af86bb500;hpb=bcb857382d7a1d4a1d806ae296bf4a94205d233b;p=packages%2Faufs.git

diff --git a/aufs.spec b/aufs.spec
index a02de69..ba1f2a4 100644
--- a/aufs.spec
+++ b/aufs.spec
@@ -16,11 +16,11 @@
 %undefine	with_userspace
 %endif
 
-%define		subver		20081030
+%define		subver		20090315
 %define		prel		0.%{subver}.%{rel}
 
 %define		pname		aufs
-%define		rel		1
+%define		rel		8
 Summary:	aufs - Another Unionfs
 Summary(pl.UTF-8):	aufs (Another Unionfs) - inny unionfs
 Name:		%{pname}%{_alt_kernel}
@@ -29,12 +29,14 @@ Release:	%{prel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	%{pname}-%{subver}.tar.bz2
-# Source0-md5:	13ea25a28c5a3ed4480c1bd7f26655df
+# Source0-md5:	f2cb8c2dcf40ed076b1fcdcb1e91412e
 Patch0:		%{pname}-vserver.patch
 #Patch1:		%{pname}-disable-security_inode_permission.patch
 Patch2:		%{pname}-fixes.patch
 #Patch3:		%{pname}-spin_lock.patch
 Patch4:		%{pname}-apparmor.patch
+Patch5:		%{pname}-br-xfs-fix.patch
+Patch6:		%{pname}-vfsub.c.patch
 URL:		http://aufs.sourceforge.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.25.2}
@@ -88,9 +90,19 @@ Ten pakiet zawiera moduł jądra Linuksa.
 #%patch1 -p1
 %patch2 -p1
 #%patch3 -p1
+%if "%{_kernel_ver}" < "2.6.30"
 if [ -d %{_kernelsrcdir}/security/apparmor ]; then
 %patch4 -p1
 fi
+%endif
+%patch5 -p1
+if [ -d %{_kernelsrcdir}/fs/unionfs ]; then
+%patch6 -p0
+%if "%{_kernel_ver}" >= "2.6.30"
+else
+%patch6 -p0
+%endif
+fi
 
 cp -a include/linux fs/aufs25
 
@@ -114,6 +126,11 @@ export CONFIG_AUFS_BR_XFS=y
 		-DCONFIG_AUFS_MODULE \
 		-UCONFIG_AUFS_KSIZE_PATCH \
 		-UCONFIG_AUFS_DLGT \
+%if "%{_alt_kernel}" != "vanilla"
+		-DCONFIG_AUFS_UNIONFS23_PATCH \
+		-DCONFIG_AUFS_UNIONFS22_PATCH \
+		-DCONFIG_AUFS_SPLICE_PATCH \
+%endif
 		%{?debug:-DCONFIG_AUFS_DEBUG} \
 		$isvserver \
 		$ino_t64"
@@ -157,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc README History
+%doc README.aufs1 README.aufs2 History
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man5/*
 %endif