- More cleanups for merge review process

- Related: bz226134

mdadm.spec

@@ -1,40 +1,38 @@
-Summary:     mdadm controls Linux md devices (software RAID arrays)
+Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.6.1
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1:     mdmonitor.init
-Patch1:	     mdadm-1.5.0-email.patch
-Patch2:      mdadm-2.5.2-s390-build.patch
-Patch3:      mdadm-2.5.2-static.patch
-Patch4:      mdadm-2.2-nodiet.patch
-Patch5:      mdadm-2.5.2-cflags.patch
-Patch6:      mdadm-2.6.1-build.patch
+Patch1:      mdadm-2.5.2-s390-build.patch
+Patch2:      mdadm-2.5.2-static.patch
+Patch3:      mdadm-2.2-nodiet.patch
+Patch4:      mdadm-2.5.2-cflags.patch
+Patch5:      mdadm-2.6.1-build.patch
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License:     GPL
 Group:       System Environment/Base
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:   mdctl,raidtools
-Requires:    smtpdaemon
+Requires:    /usr/sbin/sendmail
 Requires(post): /sbin/service, /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 
 %description 
-mdadm is used to create, manage, and monitor Linux MD (software RAID)
-devices.  As such, it provides similar functionality to the raidtools
+The mdadm program is used to create, manage, and monitor Linux MD (software
+RAID) devices.  As such, it provides similar functionality to the raidtools
 package.  However, mdadm is a single program, and it can perform
 almost all functions without a configuration file, though a configuration
 file can be used to help with some common tasks.
 
 %prep
 %setup -q
-%patch1 -p1 -b .email
-%patch2 -p1 -b .s390
-%patch3 -p1 -b .static
-%patch4 -p1 -b .nodiet
-%patch5 -p1 -b .cflags
-%patch6 -p1 -b .build
+%patch1 -p1 -b .s390
+%patch2 -p1 -b .static
+%patch3 -p1 -b .nodiet
+%patch4 -p1 -b .cflags
+%patch5 -p1 -b .build
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
@@ -74,7 +72,7 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc TODO ChangeLog mdadm.conf-example COPYING misc/*
 /sbin/*
 %{_initrddir}/*
@@ -82,6 +80,10 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Mon Apr 16 2007 Doug Ledford <dledford@redhat.com> - 2.6.1-4
+- More cleanups for merge review process
+- Related: bz226134
+
 * Wed Apr 11 2007 Doug Ledford <dledford@redhat.com> - 2.6.1-3
 - Various cleanups as part of merge review process
 - Related: bz226134
@@ -275,7 +277,7 @@ fi
 * Wed Mar 12 2002 NeilBrown <neilb@cse.unsw.edu.au>
 - Add md.4 and mdadm.conf.5 man pages
 
-* Fri Mar 08 2002		Chris Siebenmann <cks@cquest.utoronto.ca>
+* Fri Mar 08 2002 Chris Siebenmann <cks@cquest.utoronto.ca>
 - builds properly as non-root.
 
 * Fri Mar 08 2002 Derek Vadala <derek@cynicism.com>