X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver.spec.in;fp=util-vserver.spec.in;h=ab393c2e2c6b54721be65823b287030dcde8d91f;hb=7253ee8804a41c4ba6d1eb7c58400ac28bdd5ec7;hp=77124593d229397f133c9e76f10b611f14da9d0b;hpb=5580eb5721672e0da93b99fc03b5d7b564b8a4fc;p=util-vserver.git 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