SPECS: dmraid.spec - rel 4 - added unsigned patch (uint -> unsigned int, di...

[baggins]

Author: baggins                      Date: Wed Mar 18 14:13:56 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4
- added unsigned patch (uint -> unsigned int, die, BSD, die!)
- build with dietlibc by default
- no selinux in dietlibc-based initrd binary

---- Files affected:
SPECS:
   dmraid.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SPECS/dmraid.spec
diff -u SPECS/dmraid.spec:1.42 SPECS/dmraid.spec:1.43
--- SPECS/dmraid.spec:1.42	Fri Feb 27 22:08:55 2009
+++ SPECS/dmraid.spec	Wed Mar 18 15:13:51 2009
@@ -1,15 +1,16 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	initrd	# without initrd version
-%bcond_without	selinux	# build without SELinux support (needs selinux-disabled device-mapper)
+%bcond_without	initrd		# without initrd version
+%bcond_without	dietlibc	# build initrd version with static glibc instead of dietlibc
+%bcond_without	selinux		# build without SELinux support (needs selinux-disabled device-mapper)
 #
 Summary:	Device-mapper RAID tool
 Summary(pl.UTF-8):	Narzędzie do RAID-u opartego o device-mapper
 Name:		dmraid
 Version:	1.0.0
 %define	_rc	rc15
-Release:	0.%{_rc}.3
+Release:	0.%{_rc}.4
 License:	GPL
 Group:		Base
 Source0:	http://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}.%{_rc}.tar.bz2
@@ -20,16 +21,28 @@
 Patch1:		%{name}-fix.patch
 Patch2:		%{name}-optflags.patch
 Patch3:		%{name}-as-needed.patch
+Patch4:		%{name}-unsigned.patch
 URL:		http://people.redhat.com/~heinzm/sw/dmraid/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	device-mapper-devel >= 1.02.02
 BuildRequires:	zlib-devel
 %if %{with initrd}
+	%if %{with dietlibc}
+BuildRequires:	device-mapper-dietlibc
+BuildRequires:	dietlibc-static >= 2:0.31-5
+	%else
 BuildRequires:	device-mapper-static >= 1.02.05-0.4
 BuildRequires:	glibc-static
-%{?with_selinux:BuildRequires:	libselinux-static}
-%{?with_selinux:BuildRequires:	libsepol-static}
+%if %{with selinux}
+BuildRequires:	libselinux-static
+BuildRequires:	libsepol-static
+%endif
+	%endif
+%endif
+%if %{with selinux}
+BuildRequires:	libselinux-devel
+BuildRequires:	libsepol-devel
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -105,6 +118,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -113,7 +127,16 @@
 
 %if %{with initrd}
 %configure \
+	%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -static"} \
+	%if %{with selinux} && %{with glibc}
+	--enable-libselinux \
+	--enable-libsepol \
+	%else
+	--disable-libselinux \
+	--disable-libsepol \
+	%endif
 	--enable-static_link
+
 %{__make} -j1
 cp -f tools/dmraid{,-initrd}
 %{__make} clean
@@ -183,6 +206,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2009/03/18 14:13:51  baggins
+- rel 4
+- added unsigned patch (uint -> unsigned int, die, BSD, die!)
+- build with dietlibc by default
+- no selinux in dietlibc-based initrd binary
+
 Revision 1.42  2009/02/27 21:08:55  baggins
 - rel 3
 - moved dmraid binary and library to /
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dmraid.spec?r1=1.42&r2=1.43&f=u