sync with upstream

[util-vserver.git] / util-vserver.spec

diff --git a/util-vserver.spec b/util-vserver.spec
index c618870..1b6305a 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -24,7 +24,7 @@
 
 # for module-tools
 %global module_version_varname modulever
-%global taglevel 2
+%global taglevel 3
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
@@ -36,10 +36,10 @@ License:    GPL
 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:      http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2.asc
+Source1:       fstab
 Patch1:                f12.patch
-Patch2:                remove-tmpfs.patch
-Patch3:                f13.patch
+Patch2:                f13.patch
+Patch3:         rev2883to2896.patch
 BuildRoot:     %_tmppath/%name-%version-%release-root
 Requires:      init(%name)
 Requires:      %name-core = %version-%release
@@ -199,7 +199,7 @@ Linux-VServer API from Python.
 %setup -q -n %name-%fullver
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
+%patch2 -p0
 autoreconf -fi
 
 %build
@@ -223,6 +223,7 @@ 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
 
 %check
 %__make check
@@ -256,7 +257,6 @@ test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || :
 %chkconfig --add vprocunhide
 %chkconfig --add util-vserver
 %chkconfig util-vserver on
-service util-vserver restart
 
 %preun sysv
 test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || :
@@ -398,6 +398,9 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/dev/null || :
 
 
 %changelog
+* Tue Jun 08 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-3
+- Do not restart util-vserver service on upgrades
+
 * Tue Jun 01 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-2
 - remove tmpfs mounted /tmp from fstab template