X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=09a2f3c46b646a8ddbc8e0a90ff49dc7c33c9b74;hb=5f3f412e2a4ddff92b8c09da74a969bbf16805bf;hp=584975e36efc4fb172f49af9e80bdc5834957274;hpb=fd45931173f89e54da8a4066d8b29ab105aefbd8;p=util-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index 584975e..09a2f3c 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,4 +1,3 @@
-# $Id: util-vserver.spec.in 2807 2008-10-30 01:59:52Z dhozac $
 
 %if "%{?_without_python:1}" != "1"
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -17,14 +16,14 @@
 
 %global _localstatedir	%_var
 
-%global fullver		0.30.216-pre2926
+%global fullver		0.30.216-pre2939
 %global modulever 0.30.216
 %global ver		%( echo %fullver | sed 's/-.*//' )
 %global subver		%( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
 
 # for module-tools
 %global module_version_varname modulever
-%global taglevel 11
+%global taglevel 16
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
@@ -34,10 +33,13 @@ Version:	%ver
 Release:	%taglevel
 License:	GPL
 Group:		System Environment/Base
-URL:		http://savannah.nongnu.org/projects/util-vserver/
+URL:		http://linux-vserver.org/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2
 Source1:	fstab
 Source2:	vprocunhide-files
+Patch1: nomtab.patch
+Patch2: upstart.patch
+Patch3: sl.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release
@@ -45,7 +47,7 @@ Requires:	%name-lib  = %version-%release
 Requires:	diffutils mktemp sed
 Provides:	vserver = %version-%release
 Obsoletes:	vserver < %version
-BuildRequires:	mount vconfig gawk /sbin/ip iptables
+BuildRequires:	util-linux vconfig gawk /sbin/ip iptables
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel e2fsprogs
 %{!?_without_beecrypt:BuildRequires: beecrypt-devel}
@@ -195,6 +197,9 @@ Linux-VServer API from Python.
 
 %prep
 %setup -q -n %name-%fullver
+%patch1 -p1
+%patch2 -p1
+%patch3 -p0
 autoreconf -fi
 
 %build
@@ -396,6 +401,22 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/dev/null || :
 
 
 %changelog
+* Tue Jun 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - util-vserver-0.30.216-16
+- fixes for scientific linux
+
+* Thu Mar 10 2011 S.Çağlar Onur <caglar@verivue.com> - util-vserver-0.30.216-15
+- * Sync with upstream
+- * Add SL6 as a supported distro
+
+* Fri Feb 18 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - util-vserver-0.30.216-14
+- Retagging to make sure the tagging operation worked.
+
+* Fri Feb 18 2011 Andy Bavier <acb@cs.princeton.edu> - util-vserver-0.30.216-13
+- Add /proc/diskstats to vprocunhide-files
+
+* Mon Jan 31 2011 Andy Bavier <acb@cs.princeton.edu> - util-vserver-0.30.216-12
+- add files needed by CoMon to vprocunhide-files list
+
 * Thu Jan 20 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-11
 - add a custom vprocunhide-files file which contains /proc/partitions