From: Daniel Hokka Zakrisson Date: Fri, 26 Jun 2009 00:30:59 +0000 (+0000) Subject: Make the specfile work on Mandriva 2009.1. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1831f5ed07a9d5b2718b57ee6abb7400756347fd;p=util-vserver.git Make the specfile work on Mandriva 2009.1. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2841 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver.spec.in b/util-vserver.spec.in index df9d31a..48026ae 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}