- --without initrd -> --with initrd (bsp now handles starting raid OK)

- new %doc
- BOOT patch enabled (why was it disabled)

Changed files:
    mdadm.spec -> 1.4

diff --git a/mdadm.spec b/mdadm.spec
index e6a086a7227f2e1bfbdb4bc95018fc6f72da8609..b0f87a5a680c06724adafbabf8c5b511bc787a36 100644 (file)
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-#  --without initrd -- don't build initrd version
+#  --with initrd -- build initrd version
 Summary:       Tool for creating and maintaining software RAID devices
 Summary(pl):   Narzêdzie do tworzenia i obs³ugi programowych macierzy RAID
 Name:          mdadm
@@ -10,7 +10,7 @@ License:      GPL
 Group:         Base
 Source0:       http://www.cse.unsw.edu.au/~neilb/source/mdadm/%{name}-%{version}.tgz
 Patch0:                %{name}-BOOT.patch
-%{!?_without_initrd:BuildRequires:     dietlibc-static}
+%{?_with_initrd:BuildRequires: dietlibc-static}
 BuildRequires: groff
 Obsoletes:     mdctl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,12 +42,12 @@ zlinkowane na potrzeby initrd.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 
 %build
-%{!?_without_initrd:%{__make} CC="%{_arch}-dietlibc-gcc" CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" static}
-%{!?_without_initrd:mv mdadm initrd-mdadm}
-%{!?_without_initrd:%{__make} clean}
+%{?_with_initrd:%{__make} CC="%{_arch}-dietlibc-gcc" CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" static}
+%{?_with_initrd:mv mdadm initrd-mdadm}
+%{?_with_initrd:%{__make} clean}
 
 %{__make} \
        CC="%{__cc}" \
@@ -59,7 +59,7 @@ zlinkowane na potrzeby initrd.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_sysconfdir}}
 
-%{!?_without_initrd:install initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}}
+%{?_with_initrd:install initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}}
 install mdadm $RPM_BUILD_ROOT%{_sbindir}
 
 install *.5 $RPM_BUILD_ROOT%{_mandir}/man5
@@ -68,20 +68,20 @@ install *.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install mdadm.conf-example $RPM_BUILD_ROOT%{_sysconfdir}/mdadm.conf
 
 ln -s mdadm $RPM_BUILD_ROOT%{_sbindir}/mdctl
-%{!?_without_initrd:ln -s initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}/initrd-mdctl}
+%{?_with_initrd:ln -s initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}/initrd-mdctl}
 
-gzip -9nf ANNOUNCE TODO
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc ANNOUNCE TODO
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/mdadm.conf
 %{_mandir}/man?/*
 
-%if %{?_without_initrd:0}%{!?_without_initrd:1}
+%if %{?_with_initrd:1}%{!?_with_initrd:0}
 %files initrd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/initrd-mdadm