contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
-%check || :
+%check
%__make check
test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-*
+%pre build
+x="%_libdir/util-vserver/distributions/etch"
+test -d "$x" && mv "$x" "$x.rpmsave"
+
+
## Temporary workaround to remove old v_* files; it will conflict
## somehow with the -legacy package but can be fixed by reinstalling
## this package.