X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver.spec.in;h=660c1b46ff063a395270aa82370aa6f72be936fc;hb=HEAD;hp=ab393c2e2c6b54721be65823b287030dcde8d91f;hpb=7253ee8804a41c4ba6d1eb7c58400ac28bdd5ec7;p=util-vserver.git diff --git a/util-vserver.spec.in b/util-vserver.spec.in index ab393c2..660c1b4 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -1,10 +1,15 @@ # $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 ## --without doc ... disable doc generation ## --with legacy ... enable the legacy APIs +## --without python ... disable the Python bindings %global confdir %_sysconfdir/vservers %global confdefaultdir %confdir/.defaults @@ -18,6 +23,18 @@ %global subver %( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} ) +# Mandriva does funky stuff that break us. +%if %{?mandriva_release:1}%{!?mandriva_release:0} +%global mandriva 1 +%global _disable_libtoolize 1 +%global _disable_ld_as_needed 1 +%global _disable_ld_no_undefined 1 +%global before_configure \ + %setup_compile_flags \ + CONFIGURE_TOP="${CONFIGURE_TOP:-.}" +%endif + + %{!?release_func:%global release_func() %1%{?dist}} Summary: Linux virtual server utilities @@ -36,11 +53,14 @@ Requires: %name-lib = %version-%release Requires: diffutils mktemp sed Provides: vserver = %version-%release Obsoletes: vserver < %version -BuildRequires: mount vconfig gawk iproute iptables +BuildRequires: mount vconfig gawk /sbin/ip 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 @@ -92,6 +112,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 @@ -165,6 +190,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 @@ -174,7 +209,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} @@ -255,6 +291,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 @@ -268,11 +309,6 @@ 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. @@ -311,21 +347,10 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %doc doc/*.html doc/*.css -/sbin/vshelper -%dir %confdir -%dir %confdefaultdir -%dir %confdefaultdir/apps -%dir %confdefaultdir/files -%dir %pkglibdir/defaults %ghost %confdefaultdir/cachebase %ghost %confdefaultdir/vdirbase %ghost %confdefaultdir/run.rev -%dir %_localstatedir/cache/vservers -%dir %_localstatedir/run/vservers -%dir %_localstatedir/run/vservers.rev -%dir %_localstatedir/run/vshelper - %files lib -f %name-lib.list %files sysv -f %name-sysv.list @@ -333,24 +358,17 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %files core -f %name-core.list %defattr(-,root,root,-) -%dir %pkglibdir %files build -f %name-build.list %defattr(-,root,root,-) %doc contrib/yum*.patch -%dir %confdir/.distributions %dir %confdir/.distributions/* %dir %confdir/.distributions/*/apt -%dir %confdir/.distributions/.common -%dir %confdir/.distributions/.common/pubkeys -%dir %confdefaultdir/apps/vunify -%dir %confdefaultdir/apps/vunify/hash %files legacy -f %name-legacy.list %defattr(-,root,root,-) -%dir %pkglibdir/legacy %files devel -f %name-devel.list @@ -359,6 +377,12 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %{!?_without_doc:%doc lib/apidoc/html} +%if 0%{!?_without_python:1} +%files python -f %name-python.list +%defattr(-,root,root,-) +%endif + + %changelog * Mon Jun 25 2007 Daniel Hokka Zakrisson - 0.30.214-0 - updated URLs