%undefine with_userspace
%endif
-%define subver 20081030
+%define subver 20090315
%define prel 0.%{subver}.%{rel}
%define pname aufs
-%define rel 0.1
+%define rel 7
Summary: aufs - Another Unionfs
Summary(pl.UTF-8): aufs (Another Unionfs) - inny unionfs
Name: %{pname}%{_alt_kernel}
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}
#%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
%build
%if %{with kernel}
-if [ -f %{_kernelsrcdir}/include/linux/vs_base.h ]; then
+if [ -f %{_kernelsrcdir}/include/linux/vs_base.h &&
+ ! -d %{_kernelsrcdir}/security/apparmor ]; then
isvserver="-DVSERVER"
fi
%ifarch %{x8664} ia64 ppc64 sparc64
-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"
%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