From: Daniel Hokka Zakrisson Date: Thu, 26 Jun 2008 15:59:54 +0000 (+0000) Subject: Get rid of the etch directory for older installs. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c65fb5359a3ceed0cdd72983933e4a070f6b8d8f;p=util-vserver.git Get rid of the etch directory for older installs. Hopefully all interesting RPM versions support %check by now... Mandriva's rpm does not support the || : syntax. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2721 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 79e9569..7712459 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -191,7 +191,7 @@ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -%check || : +%check %__make check @@ -268,6 +268,11 @@ f="%confdefaultdir/apps/vunify/hash"; test -e "$f"/method -o -e "$f"/00 || \ 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.