%global _localstatedir %_var
-%global ver %( echo @VERSION@ | sed 's/-.*//' )
-%global subver %( s=`echo @VERSION@ | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
%global fullver @VERSION@
+%global ver %( echo %fullver | sed 's/-.*//' )
+%global subver %( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
%{!?release_func:%global release_func() %1%{?dist}}
Obsoletes: vserver < %version
BuildRequires: mount vconfig gawk iproute iptables
BuildRequires: gcc-c++ wget which diffutils
-BuildRequires: e2fsprogs-devel beecrypt-devel
+BuildRequires: e2fsprogs-devel e2fsprogs
+%{!?_without_beecrypt:BuildRequires: beecrypt-devel}
+%{?_without_beecrypt:BuildRequires: nss-devel}
+BuildRequires: e2fsprogs
%{!?_without_doc:BuildRequires: doxygen tetex-latex}
Requires(post): %name-core
Requires(pre): %pkglibdir
contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
-%check || :
+%check
%__make check
copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
+%pre build
+x="%_libdir/util-vserver/distributions/etch"
+test -d "$x" && mv "$x" "$x.rpmsave" || :
+
+
%post build
test -d /vservers/.hash || mkdir -m0700 /vservers/.hash