- update to 1.3.0 and enable initrd version by default

Changed files:
    mdadm.spec -> 1.12

diff --git a/mdadm.spec b/mdadm.spec
index e9686d986a915afa82ffed32801d385de6e87b18..af20f1765afbaa1ae254ae53a8d66c6d6645ed90 100644 (file)
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,19 +1,19 @@
 #
 # Conditional build:
-#  --with initrd -- build initrd version
+#  --without initrd -- build without 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
-Version:       1.2.0
-Release:       2
+Version:       1.3.0
+Release:       1
 License:       GPL
 Group:         Base
 Source0:       http://www.cse.unsw.edu.au/~neilb/source/mdadm/%{name}-%{version}.tgz
-# Source0-md5: cf8e2f4c2c77ced0fe54f87164fc3c8c
+# Source0-md5: 61186df5073fae32569bd4bb12f9da36
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-BOOT.patch
-%{?_with_initrd:BuildRequires: dietlibc-static}
+%{!?_without_initrd:BuildRequires:     dietlibc-static}
 BuildRequires: groff
 Obsoletes:     mdctl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,9 +49,9 @@ zlinkowane na potrzeby initrd.
 %patch0 -p1
 
 %build
-%{?_with_initrd:%{__make} CC="%{_arch}-dietlibc-gcc" CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" static}
-%{?_with_initrd:mv mdadm initrd-mdadm}
-%{?_with_initrd:%{__make} clean}
+%{!?_without_initrd:%{__make} CC="%{_target_cpu}-dietlibc-gcc" CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags} -static"}
+%{!?_without_initrd:mv mdadm initrd-mdadm}
+%{!?_without_initrd:%{__make} clean}
 
 %{__make} \
        CC="%{__cc}" \
@@ -63,7 +63,7 @@ zlinkowane na potrzeby initrd.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_sysconfdir}/{rc.d/init.d,sysconfig}}
 
-%{?_with_initrd:install initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}}
+%{!?_without_initrd:install initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}}
 install mdadm $RPM_BUILD_ROOT%{_sbindir}
 
 install *.5 $RPM_BUILD_ROOT%{_mandir}/man5
@@ -72,7 +72,7 @@ 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
-%{?_with_initrd:ln -s initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}/initrd-mdctl}
+%{!?_without_initrd:ln -s initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}/initrd-mdctl}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
@@ -105,7 +105,7 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/%{name}
 
-%if %{?_with_initrd:1}%{!?_with_initrd:0}
+%if %{?_without_initrd:0}%{!?_without_initrd:1}
 %files initrd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/initrd-mdadm