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=df9d31ae25a35d6ddf0aa3cf5357bc01071e113a;hpb=ffc97bb00051a5426111ca65c7e6dca595c750eb;p=util-vserver.git diff --git a/util-vserver.spec.in b/util-vserver.spec.in index df9d31a..660c1b4 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -9,6 +9,7 @@ ## --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 @@ -22,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 @@ -40,7 +53,7 @@ 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 e2fsprogs %{!?_without_beecrypt:BuildRequires: beecrypt-devel} @@ -334,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 @@ -356,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 @@ -382,9 +377,10 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %{!?_without_doc:%doc lib/apidoc/html} -%files python +%if 0%{!?_without_python:1} +%files python -f %name-python.list %defattr(-,root,root,-) -%{!?_without_python:%{python_sitearch}/*} +%endif %changelog