Author: qboosh Date: Mon Feb 21 19:46:04 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- initrd bcond, cosmetics
---- Files affected:
SPECS:
dmraid.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SPECS/dmraid.spec
diff -u SPECS/dmraid.spec:1.7 SPECS/dmraid.spec:1.8
--- SPECS/dmraid.spec:1.7 Mon Feb 21 19:45:06 2005
+++ SPECS/dmraid.spec Mon Feb 21 20:45:59 2005
@@ -1,4 +1,8 @@
# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without initrd # without initrd version
+#
Summary: Device-mapper RAID tool
Summary(pl): Narzędzie do RAID-u opartego o device-mapper
Name: dmraid
@@ -13,7 +17,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: device-mapper-devel
-BuildRequires: device-mapper-static
+%{?with_initrd:BuildRequires: device-mapper-static}
BuildRequires: gettext-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,10 +36,10 @@
Group: Base
%description initrd
-Static version of dmraid
+Statically linked version of dmraid utility.
%description initrd -l pl
-Wersja statyczna dmraid
+Statycznie zlinkowana wersja narzędzia dmraid.
%prep
%setup -q -n %{name}
@@ -47,11 +51,15 @@
%{__gettextize}
%{__aclocal}
%{__autoconf}
-%configure --enable-static_link
-%{__make}
-cp tools/dmraid{,-initrd}
+%if %{with initrd}
+%configure \
+ --enable-static_link
+%{__make}
+cp -f tools/dmraid{,-initrd}
%{__make} clean
+%endif
+
%configure
%{__make}
@@ -71,9 +79,11 @@
%attr(755,root,root) %{_sbindir}/*
%{_mandir}/man8/*
+%if %{with initrd}
%files initrd
%defattr(644,root,root,755)
%attr(755,root,root) /sbin/*
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -81,6 +91,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2005/02/21 19:45:59 qboosh
+- initrd bcond, cosmetics
+
Revision 1.7 2005/02/21 18:45:06 adasi
- added static version
- still needs fix - won't work on non-selinux systems
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/dmraid.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit