--- mdadm.spec	(revision 16)
+++ mdadm.spec	(working copy)
@@ -2,7 +2,7 @@ 
 
 Name: mdadm
 Version: 2.6
-Release: alt2
+Release: alt3
 
 Summary: A tool for managing Soft RAID under Linux
 License: GPL
@@ -14,8 +14,6 @@ 
 Source2: raidtabtomdadm.sh
 Source3: rc.sysinit-mdassemble.patch
 Source4: %name.conf
-Patch0: %name-2.5-alt-no_strict_aliasing.patch
-Patch1: %name-2.5-alt-sha1sources.patch
 Patch2: %name-2.5.5-alt-asprintf.patch
 Patch3: %name-2.6-alt-nowarn.patch
 
@@ -24,9 +22,15 @@ 
 
 %if_without dietlibc
 %define mdassemble_binary mdassemble.static
+%define prot_flag %nil
 
 %else
 %define mdassemble_binary mdassemble
+%if %__gcc_version_major > 3
+%define prot_flag -fno-stack-protector
+%else
+%define prot_flag %nil
+%endif
 
 %ifarch x86_64
 BuildPreReq: dietlibc >= 0.30-alt1.1
@@ -71,15 +75,14 @@ 
 
 %prep
 %setup -q
-%patch0 -p1
-#patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %__cp -au %SOURCE2 %SOURCE3 .
 
 %build
-%make_build %mdassemble_binary CXFLAGS="%optflags" MDASSEMBLE_AUTO=1 SYSCONFDIR="%_sysconfdir"
-%make_build CXFLAGS="%optflags" SYSCONFDIR="%_sysconfdir"
+%make_build %mdassemble_binary CXFLAGS="%optflags -fno-strict-aliasing %prot_flag" SYSCONFDIR="%_sysconfdir" MDASSEMBLE_AUTO=1
+%make_build                    CXFLAGS="%optflags -fno-strict-aliasing"            SYSCONFDIR="%_sysconfdir"
+%make_build mdassemble.man
 bzip2 -9fk ChangeLog
 
 %if_with udev
@@ -92,6 +95,7 @@ 
 install -pD -m740 misc/syslog-events %buildroot%_sbindir/%name-syslog-events
 install -pD -m740 %mdassemble_binary %buildroot/sbin/mdassemble
 install -pD -m600 %SOURCE4 %buildroot%_sysconfdir/%name.conf
+install -pD -m644 mdassemble.man %buildroot%_man8dir/mdassemble.8
 %if_with udev
 %__touch %buildroot%pre_udev_conf
 %endif
@@ -132,6 +136,10 @@ 
 %doc TODO ChangeLog.bz2 %name.conf-example ANNOUNCE-%version
 
 %changelog
+* Mon Jan 29 2007 Ilya Evseev <evseev@altlinux.ru> 2.6-alt3
+- mdassemble bugfixes 10357 (dietlibc crash), 10727 (missing manpage)
+- remove patches #0, #1
+
 * Wed Jan 24 2007 Ilya Evseev <evseev@altlinux.ru> 2.6-alt2
 - fixed x86_64 problems