%global _localstatedir %_var
-%global fullver 0.30.216-pre2883
+%global fullver 0.30.216-pre2924
%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 2
+%global taglevel 8
%{!?release_func:%global release_func() %1%{?dist}}
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
-Patch1: f12.patch
-Patch2: remove-tmpfs.patch
+Source1: fstab
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
Requires: %name-core = %version-%release
%prep
%setup -q -n %name-%fullver
-%patch1 -p0
-%patch2 -p1
autoreconf -fi
%build
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
%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 || :
%files -f %name-base.list
%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%doc doc/*.html doc/*.css
+%doc AUTHORS COPYING NEWS README THANKS
+#%doc AUTHORS COPYING ChangeLog NEWS README THANKS
+#%doc doc/*.html doc/*.css
/sbin/vshelper
%dir %confdir
%dir %confdefaultdir
%changelog
+* 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
+
+* Mon Aug 09 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-6
+- Sync with upstream revision 2908
+
+* Thu Jul 29 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-5
+- Fix f12 build
+
+* Wed Jul 28 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-4
+- Sync with upstream revision 2902
+
+* 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