From: Daniel Hokka Zakrisson Date: Tue, 8 Jul 2008 15:11:09 +0000 (+0000) Subject: Order the scriptlets logically. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b578183dad15aab7982139cd6231a90d7cc7dcfb;p=util-vserver.git Order the scriptlets logically. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2729 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver.spec.in b/util-vserver.spec.in index ab393c2..5d37de3 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -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.