X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec.in;fp=util-vserver.spec.in;h=30d9929096d5c9fed3a88941be75b2f44ad44830;hb=616c79d7eee3bff076671ee8d475df2f2b640a16;hp=85d5e464ece4e1e503ba1e3630599b4f025eae9c;hpb=a89a5abe2caafac29972879f6cbf177d6c1567ac;p=util-vserver.git

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index 85d5e46..30d9929 100644
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -9,6 +9,7 @@
 ## --with xalan              ...   require/use the xalan xslt processor
 ## --without doc             ...   disable doc generation
 ## --with legacy             ...   enable the legacy APIs
+## --without python          ...   disable the Python bindings
 
 %global confdir		%_sysconfdir/vservers
 %global confdefaultdir	%confdir/.defaults
@@ -22,6 +23,18 @@
 %global subver		%( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
 
 
+# Mandriva does funky stuff that break us.
+%if %{?mandriva_release:1}%{!?mandriva_release:0}
+%global mandriva			1
+%global _disable_libtoolize		1
+%global _disable_ld_as_needed		1
+%global _disable_ld_no_undefined	1
+%global before_configure	\
+	%setup_compile_flags	\
+	CONFIGURE_TOP="${CONFIGURE_TOP:-.}"
+%endif
+
+
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	Linux virtual server utilities
@@ -40,7 +53,7 @@ Requires:	%name-lib  = %version-%release
 Requires:	diffutils mktemp sed
 Provides:	vserver = %version-%release
 Obsoletes:	vserver < %version
-BuildRequires:	mount vconfig gawk iproute iptables
+BuildRequires:	mount vconfig gawk /sbin/ip iptables
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel e2fsprogs
 %{!?_without_beecrypt:BuildRequires: beecrypt-devel}