X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=3e0d31c59a1c918e5d77c22b29bcdf274c54fd85;hb=c690c0ebffa637134a5857329d6cb4669107b854;hp=f47bccfa068a20fcc8dbd126b0b0ee6604a914c3;hpb=97bfe09c4d0143b1aefd8a9c42e90eeab69a3031;p=util-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index f47bccf..3e0d31c 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -17,14 +17,14 @@
 
 %global _localstatedir	%_var
 
-%global fullver		0.30.216-pre2912
+%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 7
+%global taglevel 14
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
@@ -37,8 +37,7 @@ Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2
 Source1:	fstab
-Patch1:		f12.patch
-Patch2:		f13.patch
+Source2:	vprocunhide-files
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release
@@ -196,8 +195,6 @@ Linux-VServer API from Python.
 
 %prep
 %setup -q -n %name-%fullver
-%patch1 -p0
-%patch2 -p1
 autoreconf -fi
 
 %build
@@ -221,7 +218,8 @@ MANIFEST_CONFIG='%config' \
 MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
 contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
 
-install -c -m 755 %{SOURCE1} %{buildroot}/%pkglibdir/defaults/fstab
+install -c -m 644 %{SOURCE1} %{buildroot}/%pkglibdir/defaults/fstab
+install -c -m 644 %{SOURCE2} %{buildroot}/%pkglibdir/defaults/vprocunhide-files
 
 %check
 %__make check
@@ -254,6 +252,7 @@ test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || :
 %chkconfig --add vservers-default
 %chkconfig --add vprocunhide
 %chkconfig --add util-vserver
+%chkconfig vprocunhide on
 %chkconfig util-vserver on
 
 %preun sysv
@@ -397,6 +396,27 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/dev/null || :
 
 
 %changelog
+* 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
+
+* Wed Dec 08 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-10
+- Enable vprocunhide service
+
+* Wed Dec 01 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-9
+- Sync with upstream revision 2926
+
+* Tue Nov 16 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-8
+- Sync with upstream revision 2924
+
 * Thu Aug 12 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-7
 - Sync with upstream revision 2912