X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver.spec.in;h=5d37de3f5f795c2925b86894ae54e143c54f9766;hb=b578183dad15aab7982139cd6231a90d7cc7dcfb;hp=77124593d229397f133c9e76f10b611f14da9d0b;hpb=c65fb5359a3ceed0cdd72983933e4a070f6b8d8f;p=util-vserver.git diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 7712459..5d37de3 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}} @@ -255,6 +255,11 @@ copy fedora /etc/pki/rpm-gpg/RPM-GPG-* 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 @@ -268,11 +273,6 @@ 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.