From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 15 Feb 2012 16:30:58 +0000 (+0100)
Subject: tweaks for rebuilding pre3004
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=642b756144bda2a45c448c11f2fdeed70ac04c63;p=util-vserver.git

tweaks for rebuilding pre3004
---

diff --git a/util-vserver.spec b/util-vserver.spec
index cd7be1e..9961d44 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -21,6 +21,7 @@
 %global subver		%( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
 %global release		%( echo %subver | sed -e 's,\.,,' )
 
+%global _without_doc 1
 
 # Mandriva does funky stuff that break us.
 %if %{?mandriva_release:1}%{!?mandriva_release:0}
@@ -204,12 +205,16 @@ Linux-VServer API from Python.
 
 
 %build
-make -f Makefile.svn
+# could not reproduce the same trick as for 2926 
+# see log for a843358da4e3f1e894dcf2efc5f5db22d5b4739f
+# 
+#make -f Makefile.svn
 %configure --with-initrddir=%_initrddir --enable-release \
            %{?_without_dietlibc:--disable-dietlibc} \
            %{?_with_legacy:--enable-apis=NOLEGACY} \
            --with-initscripts=sysv \
-           %{?_without_python:--without-python}
+           %{?_without_python:--without-python} \
+	   --without-doc
 
 %__make %{?_smp_mflags} all
 %{!?_without_doc:%__make %{?_smp_mflags} doc}
@@ -347,7 +352,8 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/dev/null || :
 # ChangeLog not in the svn tree, make is helpless to recreate...
 #%doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %doc AUTHORS COPYING NEWS README THANKS
-%doc doc/*.html doc/*.css
+#%doc doc/*.html doc/*.css
+%doc doc/*.css
 %dir %confdir
 %dir %confdefaultdir
 %dir %confdefaultdir/apps