X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver.spec.in;h=fba68f75fca556018b5aef75392193db58406c8e;hb=446624f2c7c017695a196b82317e793c9aeae43c;hp=59ecaaa746043b9074fc37fae2fff246d6918cf9;hpb=d87cffa45b31fd44f48914b7e0a8f76a82491197;p=util-vserver.git diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 59ecaaa..fba68f7 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}} @@ -27,8 +27,8 @@ Release: %release_func 0%subver License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%fullver.tar.bz2 -#Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%fullver.tar.bz2.asc +Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2 +#Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -38,7 +38,10 @@ 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 Requires(pre): %pkglibdir @@ -58,7 +61,7 @@ Requires: util-linux %package build Summary: Tools which can be used to build vservers Group: Applications/System -Requires: rpm wget binutils tar e2fsprogs +Requires: rpm wget binutils tar Requires: %name = %version-%release Requires(pre): %confdir Requires(postun): %confdir @@ -172,7 +175,8 @@ develop VServer related applications. %build %configure --with-initrddir=%_initrddir --enable-release \ %{?_without_dietlibc:--disable-dietlibc} \ - %{?_with_legacy:--enable-apis=NOLEGACY} + %{?_with_legacy:--enable-apis=NOLEGACY} \ + --with-initscripts=sysv %__make %{?_smp_mflags} all %{!?_without_doc:%__make %{?_smp_mflags} doc} @@ -189,7 +193,7 @@ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -%check || : +%check %__make check @@ -253,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 @@ -353,6 +362,10 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Mon Jun 25 2007 Daniel Hokka Zakrisson - 0.30.214-0 +- updated URLs +- get rid of e2fsprogs requirement + * Fri Dec 29 2006 Daniel Hokka Zakrisson - 0.30.213-0 - add --with legacy and --without doc switches - add util-vserver initscript