git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There's no need to call getpwuid/getpwnam_r 5 times. Do it once before chroot, once...
[util-vserver.git]
/
util-vserver.spec.in
diff --git
a/util-vserver.spec.in
b/util-vserver.spec.in
index
1c37fcd
..
ed381b6
100644
(file)
--- a/
util-vserver.spec.in
+++ b/
util-vserver.spec.in
@@
-1,8
+1,10
@@
-# $Id: util-vserver.spec.in 2
283 2006-09-10 17:07:57Z hollow
$
+# $Id: util-vserver.spec.in 2
482 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
## 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
%global confdir %_sysconfdir/vservers
%global confdefaultdir %confdir/.defaults
@@
-11,12
+13,14
@@
%global _localstatedir %_var
%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 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
%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@
Summary: Linux virtual server utilities
Name: @PACKAGE@
-Version:
@VERSION@
-Release: %
{release}
+Version:
%ver
+Release: %
release_func 0%subver
License: GPL
Group: System Environment/Base
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
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: 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
Requires(post): %name-core
Requires(pre): %pkglibdir
Requires(postun): %pkglibdir
@@
-67,7
+71,7
@@
Requires: util-linux
%package build
Summary: Tools which can be used to build vservers
Group: Applications/System
%package build
Summary: Tools which can be used to build vservers
Group: Applications/System
-Requires: rpm wget
binutils tar e2fsprogs
+Requires: rpm wget
tar
Requires: %name = %version-%release
Requires(pre): %confdir
Requires(postun): %confdir
Requires: %name = %version-%release
Requires(pre): %confdir
Requires(postun): %confdir
@@
-187,7
+191,7
@@
but more readily accessible from Python code.
%prep
%prep
-%setup -q
+%setup -q
-n %name-%fullver
aclocal -I m4
autoconf
aclocal -I m4
autoconf
@@
-195,10
+199,12
@@
automake --add-missing
%build
%configure --with-initrddir=%_initrddir --enable-release \
%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} all
-%
__make %{?_smp_mflags} doc
+%
{!?_without_doc:%__make %{?_smp_mflags} doc}
%__make -C python
%__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 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/bwlimit $RPM_BUILD_ROOT/%{_sbindir}/bwlimit
+install -D -m 755 python/disklimit $RPM_BUILD_ROOT/%{_sbindir}/disklimit
%check || :
%check || :
@@
-263,14
+270,20
@@
fi
#%chkconfig --add vprocunhide
# PlanetLab Node Manager takes care of starting and stopping VServers
%chkconfig --del vservers-default
#%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
# PlanetLab does not require /proc security
%chkconfig --del vprocunhide
+# vip6-autod handles IPv6 auto-assignments
+%chkconfig --add vip6-autod
+
%preun sysv
#test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || :
#test "$1" != 0 || %chkconfig --del vprocunhide
#test "$1" != 0 || %chkconfig --del vservers-default
%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
+test "$1" != 0 || %chkconfig --del vip6-autod
%postun sysv
%postun sysv
@@
-392,8
+405,8
@@
done
%files devel -f %name-devel.list
%defattr(-,root,root,-)
%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
%post python
@@
-413,7
+426,7
@@
done
# Install the prebuilt extensions by hand
python_sitelib=$(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
# Install the prebuilt extensions by hand
python_sitelib=$(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-install -
D -
m 755 *.so "$python_sitelib"/
+install -m 755 *.so "$python_sitelib"/
popd
popd
@@
-441,7
+454,7
@@
done
# Install the prebuilt extensions by hand
python_sitelib=$(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
# Install the prebuilt extensions by hand
python_sitelib=$(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-install -
D -
m 755 *.so "$python_sitelib"/
+install -m 755 *.so "$python_sitelib"/
popd
popd
@@
-461,9
+474,17
@@
fi
%files python
%{_datadir}/%{name}
%{_sbindir}/bwlimit
%files python
%{_datadir}/%{name}
%{_sbindir}/bwlimit
+%{_sbindir}/disklimit
%changelog
%changelog
+* Mon Jul 30 2007 Daniel Hokka Zakrisson <daniel@hozac.com>
+- add vip6-autod
+
+* 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
* Fri Feb 17 2006 Steve Muir <smuir@cs.princeton.edu>
- add support for setting guaranteed CPU share flag in rspec