- release 6

[packages/aufs.git] / aufs.spec

diff --git a/aufs.spec b/aufs.spec
index 5b893976106c5d6d1bdb63b8805b27243006ccad..bbf9bdc8dfe6abf098276cbdccb2987691a07587 100644 (file)
--- a/aufs.spec
+++ b/aufs.spec
@@ -16,11 +16,11 @@
 %undefine      with_userspace
 %endif
 
-%define                subver          20080527
+%define                subver          20081106
 %define                prel            0.%{subver}.%{rel}
 
 %define                pname           aufs
-%define                rel             11
+%define                rel             6
 Summary:       aufs - Another Unionfs
 Summary(pl.UTF-8):     aufs (Another Unionfs) - inny unionfs
 Name:          %{pname}%{_alt_kernel}
@@ -29,11 +29,12 @@ Release:    %{prel}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       %{pname}-%{subver}.tar.bz2
-# Source0-md5: aeb6880930a8abcb60947e96b310d3df
+# Source0-md5: 9a0d8cdeae8706d51f7912b42f7dd438
 Patch0:                %{pname}-vserver.patch
-Patch1:                %{pname}-disable-security_inode_permission.patch
+#Patch1:               %{pname}-disable-security_inode_permission.patch
 Patch2:                %{pname}-fixes.patch
-Patch3:                %{pname}-spin_lock.patch
+#Patch3:               %{pname}-spin_lock.patch
+Patch4:                %{pname}-apparmor.patch
 URL:           http://aufs.sourceforge.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.25.2}
@@ -84,25 +85,25 @@ Ten pakiet zawiera moduł jądra Linuksa.
 %prep
 %setup -qn %{pname}
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-# we should make it better
-sed '
-       s/$(CONFIG_AUFS)/m/; 
-       %{!?debug:s/$(CONFIG_AUFS_DEBUG.*)/n/}; 
-       s/$(CONFIG_AUFS_HINOTIFY)/n/;
-       s/$(CONFIG_AUFS_EXPORT)/y/;
-       s/$(CONFIG_AUFS_SYSAUFS)/n/
-' -i fs/aufs/Makefile
+#%patch3 -p1
+if [ -d %{_kernelsrcdir}/security/apparmor ]; then
+%patch4 -p1
+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
+       ino_t64="-DCONFIG_AUFS_INO_T_64"
+%endif
+
 export CONFIG_AUFS=m
 export CONFIG_AUFS_BR_XFS=y
 %build_kernel_modules -C fs/aufs25 -m aufs \
@@ -113,8 +114,14 @@ 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"
+               $isvserver \
+               $ino_t64"
 %endif
 
 %if %{with userspace}