X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver.spec.in;h=77124593d229397f133c9e76f10b611f14da9d0b;hb=5580eb5721672e0da93b99fc03b5d7b564b8a4fc;hp=312e5b8c646769b6e8acbd96c722a99133475a32;hpb=3320a5b9aa1fbf35eda8ad3bf13fda7d62633a0a;p=util-vserver.git diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 312e5b8..7712459 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -39,6 +39,7 @@ Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel +BuildRequires: e2fsprogs %{!?_without_doc:BuildRequires: doxygen tetex-latex} Requires(post): %name-core Requires(pre): %pkglibdir @@ -190,7 +191,7 @@ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -%check || : +%check %__make check @@ -267,6 +268,11 @@ 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.