Revert back to pre2833, before merge

[util-vserver.git] / util-vserver.spec.in

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index de728ad..85d5e46 100644 (file)
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -1,4 +1,4 @@
-# $Id: util-vserver.spec.in 2841 2009-06-26 00:30:59Z dhozac $
+# $Id: util-vserver.spec.in 2807 2008-10-30 01:59:52Z dhozac $
 
 %if "%{?_without_python:1}" != "1"
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -9,7 +9,6 @@
 ## --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
@@ -23,18 +22,6 @@
 %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
@@ -53,7 +40,7 @@ Requires:     %name-lib  = %version-%release
 Requires:      diffutils mktemp sed
 Provides:      vserver = %version-%release
 Obsoletes:     vserver < %version
-BuildRequires: mount vconfig gawk /sbin/ip iptables
+BuildRequires: mount vconfig gawk iproute iptables
 BuildRequires: gcc-c++ wget which diffutils
 BuildRequires: e2fsprogs-devel e2fsprogs
 %{!?_without_beecrypt:BuildRequires: beecrypt-devel}