From: Daniel Hokka Zakrisson Date: Tue, 8 Jul 2008 14:07:42 +0000 (+0000) Subject: Don't fail. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7253ee8804a41c4ba6d1eb7c58400ac28bdd5ec7;p=util-vserver.git Don't fail. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2727 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 7712459..ab393c2 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -13,9 +13,9 @@ %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}} @@ -270,7 +270,7 @@ 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" +test -d "$x" && mv "$x" "$x.rpmsave" || : ## Temporary workaround to remove old v_* files; it will conflict