Merge remote-tracking branch 'origin/trellis-old' into trellis

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 4f042cf..5697992 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -21,13 +21,16 @@
 %global ver            %( echo %fullver | sed 's/-.*//' )
 %global subver         %( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
 
+# for module-tools
+%global module_version_varname fullver
+%global taglevel 0
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:       Linux virtual server utilities
 Name:          util-vserver
 Version:       %ver
-Release:       %release_func 0%subver
+Release:       %taglevel
 License:       GPL
 Group:         System Environment/Base
 URL:           http://savannah.nongnu.org/projects/util-vserver/
@@ -40,7 +43,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}
@@ -245,7 +248,7 @@ test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || :
 %chkconfig --add vservers-default
 %chkconfig --add vprocunhide
 %chkconfig --add util-vserver
-
+%chkconfig util-vserver on
 
 
 %preun sysv