X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=efcea511a262e9e3ed67d05d6537f48c8aac1b94;hb=3be76e3320954384368b3a2f76b4f91b664462f8;hp=29596cefd659b969776b2bd94cce0147f176df8a;hpb=60357054bae15581f04f5106da51c27b99a4db93;p=util-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index 29596ce..efcea51 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -17,13 +17,14 @@
 
 %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 fullver
-%global taglevel 0
+%global module_version_varname modulever
+%global taglevel 8
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
@@ -35,8 +36,7 @@ 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
-Patch1:		f12.patch
+Source1:	fstab
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release
@@ -50,7 +50,7 @@ BuildRequires:	e2fsprogs-devel e2fsprogs
 %{!?_without_beecrypt:BuildRequires: beecrypt-devel}
 %{?_without_beecrypt:BuildRequires: nss-devel}
 BuildRequires:	e2fsprogs
-#%%{!?_without_doc:BuildRequires:	doxygen tetex-latex}
+%{!?_without_doc:BuildRequires:	doxygen tetex-latex}
 %{!?_without_python:BuildRequires: python python-devel ctags}
 Requires(post):		%name-core
 Requires(pre):		%pkglibdir
@@ -194,7 +194,7 @@ Linux-VServer API from Python.
 
 %prep
 %setup -q -n %name-%fullver
-%patch1 -p0
+autoreconf -fi
 
 %build
 %configure --with-initrddir=%_initrddir --enable-release \
@@ -204,7 +204,7 @@ Linux-VServer API from Python.
            %{?_without_python:--without-python}
 
 %__make %{?_smp_mflags} all
-#%%{!?_without_doc:%__make %{?_smp_mflags} doc}
+%{!?_without_doc:%__make %{?_smp_mflags} doc}
 
 
 %install
@@ -217,6 +217,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
@@ -251,7 +252,6 @@ test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || :
 %chkconfig --add util-vserver
 %chkconfig util-vserver on
 
-
 %preun sysv
 test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || :
 
@@ -336,8 +336,9 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/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
@@ -382,8 +383,8 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/dev/null || :
 
 %files devel -f %name-devel.list
 %defattr(-,root,root,-)
-#%%{!?_without_doc:%doc lib/apidoc/latex/refman.pdf}
-#%%{!?_without_doc:%doc lib/apidoc/html}
+%{!?_without_doc:%doc lib/apidoc/latex/refman.pdf}
+%{!?_without_doc:%doc lib/apidoc/html}
 
 
 %files python
@@ -392,6 +393,29 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/dev/null || :
 
 
 %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
+
+* Tue May 11 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-0.30.216-1
+
 * Mon Jun 25 2007 Daniel Hokka Zakrisson <daniel@hozac.com> - 0.30.214-0
 - updated URLs
 - get rid of e2fsprogs requirement