SPECS: dmraid.spec - fix static link (selinux_static patch) - clean bconds ...

[baggins]

Author: baggins                      Date: Wed Mar 18 23:20:20 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix static link (selinux_static patch)
- clean bconds
- fix 64bit diet build

---- Files affected:
SPECS:
   dmraid.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/dmraid.spec
diff -u SPECS/dmraid.spec:1.44 SPECS/dmraid.spec:1.45
--- SPECS/dmraid.spec:1.44	Thu Mar 19 00:10:54 2009
+++ SPECS/dmraid.spec	Thu Mar 19 00:20:14 2009
@@ -22,6 +22,7 @@
 Patch2:		%{name}-optflags.patch
 Patch3:		%{name}-as-needed.patch
 Patch4:		%{name}-unsigned.patch
+Patch5:		%{name}-diet.patch
 URL:		http://people.redhat.com/~heinzm/sw/dmraid/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -119,6 +120,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -127,13 +129,15 @@
 
 %if %{with initrd}
 %configure \
-	%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -static"} \
-	%if %{with selinux} && %{without dietlibc}
-	--enable-libselinux \
-	--enable-libsepol \
-	%else
+	%if %{with dietlibc}
+	CC="diet %{__cc} -Os %{rpmldflags} -static" \
 	--disable-libselinux \
 	--disable-libsepol \
+	%else
+		%if %{with selinux}
+	--enable-libselinux \
+	--enable-libsepol \
+		%endif
 	%endif
 	--enable-static_link
 
@@ -206,6 +210,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2009/03/18 23:20:14  baggins
+- fix static link (selinux_static patch)
+- clean bconds
+- fix 64bit diet build
+
 Revision 1.44  2009/03/18 23:10:54  baggins
 - fix bcond
 
================================================================

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