X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=blobdiff_plain;f=util-vserver.spec.in;h=c072f48c09125b8b273194da18bd07e0a426fb06;hp=1c37fcd874548ec9939fa79ee4c183a0ab4dc130;hb=ec4370f7ebd7fb0ce7f002f5bf2c74f03acd3ec1;hpb=be7e00f3306309928406b77a54b85c1db4b319cf

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index 1c37fcd..c072f48 100644
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -1,8 +1,10 @@
-# $Id: util-vserver.spec.in 2283 2006-09-10 17:07:57Z hollow $
+# $Id: util-vserver.spec.in 2482 2007-01-29 23:37:07Z dhozac $
 
 ## This package understands the following switches:
 ## --without dietlibc        ...   disable usage of dietlibc
 ## --with xalan              ...   require/use the xalan xslt processor
+## --without doc             ...   disable doc generation
+## --with legacy             ...   enable the legacy APIs
 
 %global confdir		%_sysconfdir/vservers
 %global confdefaultdir	%confdir/.defaults
@@ -11,12 +13,14 @@
 
 %global _localstatedir	%_var
 
+%global ver		%( echo @VERSION@ | sed 's/-.*//' )
+%global subver		%( s=`echo @VERSION@ | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
+%global fullver		@VERSION@
 
-%{!?release_func:%global release_func() %1%{?dist}}
 
 %define name @PACKAGE@
 %define version @VERSION@
-%define release 15%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%{!?release_func:%global release_func() 1%{?pldistro:.%{pldistro}}%{?date:.%{date}}}
 
 %define _without_dietlibc 1
 %define _without_xalan 1
@@ -31,13 +35,13 @@ URL: http://cvs.planet-lab.org/cvs/util-vserver
 
 Summary:	Linux virtual server utilities
 Name:		@PACKAGE@
-Version:	@VERSION@
-Release:	%{release}
+Version:	%ver
+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-%version.tar.bz2
-#Source1:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc
+#URL:		http://savannah.nongnu.org/projects/util-vserver/
+Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
+#Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release
@@ -48,7 +52,7 @@ Obsoletes:	vserver < %version
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
-BuildRequires:	doxygen tetex-latex
+%{!?_without_doc:BuildRequires:	doxygen tetex-latex}
 Requires(post):		%name-core
 Requires(pre):		%pkglibdir
 Requires(postun):	%pkglibdir
@@ -187,7 +191,7 @@ but more readily accessible from Python code.
 
 
 %prep
-%setup -q
+%setup -q -n %name-%fullver
 
 aclocal -I m4
 autoconf
@@ -195,10 +199,12 @@ automake --add-missing
 
 %build
 %configure --with-initrddir=%_initrddir --enable-release \
-           %{?_without_dietlibc:--disable-dietlibc}
+           %{?_without_dietlibc:--disable-dietlibc} \
+           %{!?_without_legacy:--enable-apis=NOLEGACY} \
+           --with-initscripts=sysv
 
 %__make %{?_smp_mflags} all
-%__make %{?_smp_mflags} doc
+%{!?_without_doc:%__make %{?_smp_mflags} doc}
 
 %__make -C python
 
@@ -215,8 +221,9 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
 # install python bindings
 %__make -C python DESTDIR="$PWD/tmp" install
 install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
-install tmp/usr/lib/python*/site-packages/*.{py,so} $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+install tmp%{_libdir}/python*/site-packages/*.{py,so} $RPM_BUILD_ROOT/%{_datadir}/%{name}/
 install -D -m 755 python/bwlimit $RPM_BUILD_ROOT/%{_sbindir}/bwlimit
+install -D -m 755 python/disklimit $RPM_BUILD_ROOT/%{_sbindir}/disklimit
 
 
 %check || :
@@ -263,14 +270,17 @@ fi
 #%chkconfig --add vprocunhide
 # PlanetLab Node Manager takes care of starting and stopping VServers
 %chkconfig --del vservers-default
+%chkconfig --del util-vserver
 # PlanetLab does not require /proc security
 %chkconfig --del vprocunhide
 
+
 %preun sysv
 #test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || :
 
 #test "$1" != 0 || %chkconfig --del vprocunhide
 #test "$1" != 0 || %chkconfig --del vservers-default
+#test "$1" != 0 || %chkconfig --del util-vserver
 
 
 %postun sysv
@@ -392,8 +402,8 @@ done
 
 %files devel -f %name-devel.list
 %defattr(-,root,root,-)
-%doc lib/apidoc/latex/refman.pdf
-%doc lib/apidoc/html
+%{!?_without_doc:%doc lib/apidoc/latex/refman.pdf}
+%{!?_without_doc:%doc lib/apidoc/html}
 
 
 %post python
@@ -461,9 +471,14 @@ fi
 %files python
 %{_datadir}/%{name}
 %{_sbindir}/bwlimit
+%{_sbindir}/disklimit
 
 
 %changelog
+* Fri Dec 29 2006 Daniel Hokka Zakrisson <daniel@hozac.com> - 0.30.213-0
+- add --with legacy and --without doc switches
+- add util-vserver initscript
+
 * Fri Feb 17 2006 Steve Muir <smuir@cs.princeton.edu>
 - add support for setting guaranteed CPU share flag in rspec