X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver.spec.in;h=df9d31ae25a35d6ddf0aa3cf5357bc01071e113a;hb=ffc97bb00051a5426111ca65c7e6dca595c750eb;hp=386134ac062622eea8396b84f070e225209dc8da;hpb=5a436c3339d4caf3af1175ed41fcaab75206a59c;p=util-vserver.git diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 386134a..df9d31a 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -1,5 +1,9 @@ # $Id$ +%if "%{?_without_python:1}" != "1" +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%endif + ## This package understands the following switches: ## --without dietlibc ... disable usage of dietlibc ## --with xalan ... require/use the xalan xslt processor @@ -13,9 +17,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 +31,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,8 +42,12 @@ 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} +%{!?_without_python:BuildRequires: python python-devel ctags} Requires(post): %name-core Requires(pre): %pkglibdir Requires(postun): %pkglibdir @@ -58,7 +66,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 @@ -91,6 +99,11 @@ Group: Development/Libraries Requires: pkgconfig Requires: %name-lib = %version-%release +%package python +Summary: Python bindings to develop vserver-based applications +Group: Development/Libraries +Requires: %name-lib = %version-%release + %description util-vserver provides the components and a framework to setup virtual @@ -164,6 +177,16 @@ can't interact with services in the main server. This package contains header files and libraries which are needed to develop VServer related applications. +%description python +util-vserver provides the components and a framework to setup virtual +servers. A virtual server runs inside a linux server. It is nevertheless +highly independent. As such, you can run various services with normal +configuration. The various vservers can't interact with each other and +can't interact with services in the main server. + +This package contains the files needed to interface with the +Linux-VServer API from Python. + %prep %setup -q -n %name-%fullver @@ -173,7 +196,8 @@ develop VServer related applications. %configure --with-initrddir=%_initrddir --enable-release \ %{?_without_dietlibc:--disable-dietlibc} \ %{?_with_legacy:--enable-apis=NOLEGACY} \ - --with-initscripts=sysv + --with-initscripts=sysv \ + %{?_without_python:--without-python} %__make %{?_smp_mflags} all %{!?_without_doc:%__make %{?_smp_mflags} doc} @@ -190,7 +214,7 @@ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -%check || : +%check %__make check @@ -254,6 +278,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,7 +382,16 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %{!?_without_doc:%doc lib/apidoc/html} +%files python +%defattr(-,root,root,-) +%{!?_without_python:%{python_sitearch}/*} + + %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