X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver.spec.in;h=fba68f75fca556018b5aef75392193db58406c8e;hb=00f4a733697e86ef0b39ce3c6fc4f8a8a2f28eb6;hp=ab393c2e2c6b54721be65823b287030dcde8d91f;hpb=7253ee8804a41c4ba6d1eb7c58400ac28bdd5ec7;p=util-vserver.git diff --git a/util-vserver.spec.in b/util-vserver.spec.in index ab393c2..fba68f7 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -38,7 +38,9 @@ Provides: vserver = %version-%release Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils -BuildRequires: e2fsprogs-devel beecrypt-devel +BuildRequires: e2fsprogs-devel e2fsprogs +%{!?_without_beecrypt:BuildRequires: beecrypt-devel} +%{?_without_beecrypt:BuildRequires: nss-devel} BuildRequires: e2fsprogs %{!?_without_doc:BuildRequires: doxygen tetex-latex} Requires(post): %name-core @@ -255,6 +257,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 +275,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.