X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=blobdiff_plain;f=util-vserver.spec;h=81f276a6bc10e4a33707814b2f2ad6c57e144212;hp=1b6305a751127dc5aadb25bda2311efa85da9bf2;hb=HEAD;hpb=644ca1abbeb96b04cf8422ccfccd97010d4e96a8 diff --git a/util-vserver.spec b/util-vserver.spec index 1b6305a..81f276a 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-pre3038 %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 3 +%global taglevel 21 %{!?release_func:%global release_func() %1%{?dist}} @@ -34,12 +33,10 @@ 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 -Patch3: rev2883to2896.patch +Source2: vprocunhide-files BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -47,7 +44,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} @@ -197,9 +194,6 @@ Linux-VServer API from Python. %prep %setup -q -n %name-%fullver -%patch1 -p0 -%patch2 -p1 -%patch2 -p0 autoreconf -fi %build @@ -223,7 +217,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 @@ -256,6 +251,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 @@ -342,8 +338,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 @@ -398,6 +395,61 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Thu Feb 21 2013 Thierry Parmentelat - util-vserver-0.30.216-21 +- upgrade to 0.30.216-pre3038 + +* Fri Feb 24 2012 Thierry Parmentelat - util-vserver-0.30.216-20 +- bump to 0.30.216-pre3004 + +* Mon Nov 28 2011 Thierry Parmentelat - util-vserver-0.30.216-19 +- typo in dual mirror building + +* Mon Nov 07 2011 Thierry Parmentelat - util-vserver-0.30.216-18 +- 2 places for pulling sources from in case of network outage + +* Thu Jul 07 2011 Thierry Parmentelat - util-vserver-0.30.216-17 +- only tweaked specfile for fedora15 - requires util-linux instead of mount + +* 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