-Provides: vserver = %epoch:%version-%release
-Conflicts: vserver < %epoch:%version-%release
-Conflicts: vserver > %epoch:%version-%release
-BuildRequires: e2fsprogs-devel
-Requires(post): %__chattr
-
-%package linuxconf
-Summary: Linuxconf administration modules for vservers
-Group: Applications/System
-Requires: %name = %epoch:%version-%release
-Provides: vserver-admin = %epoch:%version-%release
-Conflicts: vserver-admin < %epoch:%version-%release
-Conflicts: vserver-admin > %epoch:%version-%release
+Requires: init(%name)
+Requires: %name-core = %version-%release
+Requires: %name-lib = %version-%release
+Requires: diffutils mktemp sed
+Provides: vserver = %version-%release
+Obsoletes: vserver < %version
+BuildRequires: mount vconfig gawk /sbin/ip iptables
+BuildRequires: gcc-c++ wget which diffutils
+BuildRequires: e2fsprogs-devel e2fsprogs
+%{!?_without_beecrypt:BuildRequires: beecrypt-devel}
+%{?_without_beecrypt:BuildRequires: nss-devel}
+BuildRequires: e2fsprogs
+%{!?_without_doc:BuildRequires: doxygen tetex-latex}
+%{!?_without_python:BuildRequires: python python-devel ctags}
+Requires(post): %name-core
+Requires(pre): %pkglibdir
+Requires(postun): %pkglibdir
+%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.25}
+%{?_with_xalan:BuildRequires: xalan-j}
+
+%package lib
+Summary: Dynamic libraries for util-vserver
+Group: System Environment/Libraries
+
+%package core
+Summary: The core-utilities for util-vserver
+Group: Applications/System
+Requires: util-linux
+
+%package build
+Summary: Tools which can be used to build vservers
+Group: Applications/System
+Requires: rpm wget binutils tar
+Requires: %name = %version-%release
+Requires(pre): %confdir
+Requires(postun): %confdir
+Requires(post): %name-core
+
+%package sysv
+Summary: SysV-initscripts for vserver
+Group: System Environment/Base
+Provides: init(%name) = sysv
+Requires: make diffutils
+Requires: initscripts
+Requires: %name = %version-%release
+Requires(post): %chkconfig
+Requires(preun): %chkconfig
+Requires(pre): %_initrddir %pkglibdir
+requires(postun): %_initrddir %pkglibdir
+
+%package legacy
+Summary: Legacy utilities for util-vserver
+Group: Applications/System
+Requires: %name = %version-%release
+Requires(post): %chkconfig
+Requires(preun): %chkconfig
+Requires(pre): %_initrddir %pkglibdir
+requires(postun): %_initrddir %pkglibdir
+
+%package devel
+Summary: Header-files and libraries needed to develop vserver based applications
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %name-lib = %version-%release
+
+%package python
+Summary: Python bindings to develop vserver-based applications
+Group: Development/Libraries
+Requires: %name-lib = %version-%release
+