X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=aufs.spec;h=dff481f615003d6eaed98133e242bdfdb078a7e5;hb=8c0c9bc52ca06e7aa563f5850df0fdf0fbaa4a53;hp=1d0681a56f27459e94b3f94391da0d25bf1efdf7;hpb=0f3a7497f506cb43366d4b415ae3470f031d4fc7;p=packages%2Faufs.git

diff --git a/aufs.spec b/aufs.spec
index 1d0681a..dff481f 100644
--- a/aufs.spec
+++ b/aufs.spec
@@ -1,30 +1,37 @@
 #
+# TODO:
+# - define CONFIG_ option directly
+#
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %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
 %endif
 
-%define		_cvsdate	20070424
-%define		_rel		0.%{_cvsdate}.1
+%define		subver		20080527
+%define		prel		0.%{subver}.%{rel}
+
+%define		rel		6
 Summary:	aufs - Another Unionfs
 Summary(pl.UTF-8):	aufs (Another Unionfs) - inny unionfs
 Name:		aufs
 Version:	0
-Release:	%{_rel}
+Release:	%{prel}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://www.pers.pl/%{name}-%{_cvsdate}.tar.bz2
-# Source0-md5:	526264eaac467144032e66a680fa03bf
+Source0:	%{name}-%{subver}.tar.bz2
+# Source0-md5:	aeb6880930a8abcb60947e96b310d3df
 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.14}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.25.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 BuildRequires:	sed >= 4.0
@@ -51,7 +58,7 @@ aufs-a. Część terminologii wywodzi się z unionfs-a.
 %package -n kernel%{_alt_kernel}-fs-aufs
 Summary:	Linux driver for aufs
 Summary(pl.UTF-8):	Sterownik dla Linuksa do aufs
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{prel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
@@ -71,10 +78,12 @@ Ten pakiet zawiera moduł jądra Linuksa.
 
 %prep
 %setup -qn %{name}
-%if %{with vserver}
 %patch0 -p1
-%endif
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
+# we should make it better
 sed '
 	s/$(CONFIG_AUFS)/m/; 
 	%{!?debug:s/$(CONFIG_AUFS_DEBUG.*)/n/}; 
@@ -82,27 +91,44 @@ 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}
-%build_kernel_modules -C fs/aufs -m aufs \
-	EXTRA_CFLAGS=" \
+if [ -f %{_kernelsrcdir}/include/linux/vs_base.h ]; then
+	isvserver="-DVSERVER"
+fi
+export CONFIG_AUFS=m
+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 \
 		-DCONFIG_AUFS_MODULE \
 		-UCONFIG_AUFS_KSIZE_PATCH \
+		-UCONFIG_AUFS_DLGT \
 		%{?debug:-DCONFIG_AUFS_DEBUG} \
-		%{?with_vserver:-DVSERVER} \
-	"
+		$isvserver"
+%endif
+
+%if %{with userspace}
+%{__make} -C util \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -DCONFIG_AUFS_BRANCH_MAX_127"
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with userspace}
+install -d $RPM_BUILD_ROOT{%{_mandir}/man5,%{_sbindir}}
+install util/{mount.aufs,umount.aufs,auplink,aulchown} $RPM_BUILD_ROOT%{_sbindir}
+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
@@ -125,4 +151,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README History
+%attr(755,root,root) %{_sbindir}/*
+%{_mandir}/man5/*
 %endif