X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=09a2f3c46b646a8ddbc8e0a90ff49dc7c33c9b74;hb=5f3f412e2a4ddff92b8c09da74a969bbf16805bf;hp=6a8da13cba076119f22b321d2ed0b16cab5de5cf;hpb=239d32c4103bfd402e67dab880c4fdaea28f2d04;p=util-vserver.git diff --git a/util-vserver.spec b/util-vserver.spec index 6a8da13..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-pre2883 +%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 2 +%global taglevel 16 %{!?release_func:%global release_func() %1%{?dist}} @@ -34,11 +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 -Patch1: f12.patch -Patch2: f13.patch +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 @@ -46,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} @@ -196,8 +197,9 @@ Linux-VServer API from Python. %prep %setup -q -n %name-%fullver -%patch1 -p0 +%patch1 -p1 %patch2 -p1 +%patch3 -p0 autoreconf -fi %build @@ -221,7 +223,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,8 +257,8 @@ 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 -service util-vserver restart %preun sysv test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : @@ -341,8 +344,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 @@ -397,6 +401,49 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Tue Jun 07 2011 Thierry Parmentelat - util-vserver-0.30.216-16 +- fixes for scientific linux + +* Thu Mar 10 2011 S.Çağlar Onur - util-vserver-0.30.216-15 +- * Sync with upstream +- * Add SL6 as a supported distro + +* Fri Feb 18 2011 Sapan Bhatia - util-vserver-0.30.216-14 +- Retagging to make sure the tagging operation worked. + +* Fri Feb 18 2011 Andy Bavier - util-vserver-0.30.216-13 +- Add /proc/diskstats to vprocunhide-files + +* Mon Jan 31 2011 Andy Bavier - util-vserver-0.30.216-12 +- add files needed by CoMon to vprocunhide-files list + +* Thu Jan 20 2011 S.Çağlar Onur - util-vserver-0.30.216-11 +- add a custom vprocunhide-files file which contains /proc/partitions + +* Wed Dec 08 2010 S.Çağlar Onur - util-vserver-0.30.216-10 +- Enable vprocunhide service + +* Wed Dec 01 2010 S.Çağlar Onur - util-vserver-0.30.216-9 +- Sync with upstream revision 2926 + +* Tue Nov 16 2010 S.Çağlar Onur - util-vserver-0.30.216-8 +- Sync with upstream revision 2924 + +* Thu Aug 12 2010 S.Çağlar Onur - util-vserver-0.30.216-7 +- Sync with upstream revision 2912 + +* Mon Aug 09 2010 S.Çağlar Onur - util-vserver-0.30.216-6 +- Sync with upstream revision 2908 + +* Thu Jul 29 2010 S.Çağlar Onur - util-vserver-0.30.216-5 +- Fix f12 build + +* Wed Jul 28 2010 S.Çağlar Onur - util-vserver-0.30.216-4 +- Sync with upstream revision 2902 + +* Tue Jun 08 2010 S.Çağlar Onur - util-vserver-0.30.216-3 +- Do not restart util-vserver service on upgrades + * Tue Jun 01 2010 S.Çağlar Onur - util-vserver-0.30.216-2 - remove tmpfs mounted /tmp from fstab template