X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=blobdiff_plain;f=util-vserver.spec;h=81f276a6bc10e4a33707814b2f2ad6c57e144212;hp=687035e8b8492b79eee6e806f38cbe1b78b9866a;hb=HEAD;hpb=5f917915b5648233b3e58488b56a718db3af397f diff --git a/util-vserver.spec b/util-vserver.spec index 687035e..81f276a 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,8 +1,13 @@ -# $Id: util-vserver.spec.in 2283 2006-09-10 17:07:57Z hollow $ + +%if "%{?_without_python:1}" != "1" +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%endif ## This package understands the following switches: ## --without dietlibc ... disable usage of dietlibc ## --with xalan ... require/use the xalan xslt processor +## --without doc ... disable doc generation +## --with legacy ... enable the legacy APIs %global confdir %_sysconfdir/vservers %global confdefaultdir %confdir/.defaults @@ -11,18 +16,27 @@ %global _localstatedir %_var +%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 21 %{!?release_func:%global release_func() %1%{?dist}} Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.212 -Release: %release_func 0 +Version: %ver +Release: %taglevel License: GPL Group: System Environment/Base -URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2 -#Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc +URL: http://linux-vserver.org/ +Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2 +Source1: fstab +Source2: vprocunhide-files BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -30,10 +44,14 @@ Requires: %name-lib = %version-%release Requires: diffutils mktemp sed Provides: vserver = %version-%release Obsoletes: vserver < %version -BuildRequires: mount vconfig gawk iproute iptables +BuildRequires: util-linux vconfig gawk /sbin/ip iptables BuildRequires: gcc-c++ wget which diffutils -BuildRequires: e2fsprogs-devel beecrypt-devel -BuildRequires: doxygen tetex-latex +BuildRequires: e2fsprogs-devel e2fsprogs +%{!?_without_beecrypt:BuildRequires: beecrypt-devel} +%{?_without_beecrypt:BuildRequires: nss-devel} +BuildRequires: e2fsprogs +%{!?_without_doc:BuildRequires: doxygen tetex-latex} +%{!?_without_python:BuildRequires: python python-devel ctags} Requires(post): %name-core Requires(pre): %pkglibdir Requires(postun): %pkglibdir @@ -52,7 +70,7 @@ Requires: util-linux %package build Summary: Tools which can be used to build vservers Group: Applications/System -Requires: rpm wget binutils tar e2fsprogs +Requires: rpm wget binutils tar Requires: %name = %version-%release Requires(pre): %confdir Requires(postun): %confdir @@ -85,6 +103,11 @@ Group: Development/Libraries Requires: pkgconfig Requires: %name-lib = %version-%release +%package python +Summary: Python bindings to develop vserver-based applications +Group: Development/Libraries +Requires: %name-lib = %version-%release + %description util-vserver provides the components and a framework to setup virtual @@ -158,17 +181,30 @@ can't interact with services in the main server. This package contains header files and libraries which are needed to develop VServer related applications. +%description python +util-vserver provides the components and a framework to setup virtual +servers. A virtual server runs inside a linux server. It is nevertheless +highly independent. As such, you can run various services with normal +configuration. The various vservers can't interact with each other and +can't interact with services in the main server. -%prep -%setup -q +This package contains the files needed to interface with the +Linux-VServer API from Python. +%prep +%setup -q -n %name-%fullver +autoreconf -fi + %build %configure --with-initrddir=%_initrddir --enable-release \ - %{?_without_dietlibc:--disable-dietlibc} + %{?_without_dietlibc:--disable-dietlibc} \ + %{?_with_legacy:--enable-apis=NOLEGACY} \ + --with-initscripts=sysv \ + %{?_without_python:--without-python} %__make %{?_smp_mflags} all -%__make %{?_smp_mflags} doc +%{!?_without_doc:%__make %{?_smp_mflags} doc} %install @@ -181,8 +217,10 @@ MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat +install -c -m 644 %{SOURCE1} %{buildroot}/%pkglibdir/defaults/fstab +install -c -m 644 %{SOURCE2} %{buildroot}/%pkglibdir/defaults/vprocunhide-files -%check || : +%check %__make check @@ -212,14 +250,16 @@ test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || : %post sysv %chkconfig --add vservers-default %chkconfig --add vprocunhide - - +%chkconfig --add util-vserver +%chkconfig vprocunhide on +%chkconfig util-vserver on %preun sysv test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : test "$1" != 0 || %chkconfig --del vprocunhide test "$1" != 0 || %chkconfig --del vservers-default +test "$1" != 0 || %chkconfig --del util-vserver %postun sysv @@ -244,6 +284,11 @@ copy fedora /etc/pki/rpm-gpg/RPM-GPG-* copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-* +%pre build +x="%_libdir/util-vserver/distributions/etch" +test -d "$x" && mv "$x" "$x.rpmsave" || : + + %post build test -d /vservers/.hash || mkdir -m0700 /vservers/.hash @@ -293,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 @@ -339,11 +385,87 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %files devel -f %name-devel.list %defattr(-,root,root,-) -%doc lib/apidoc/latex/refman.pdf -%doc lib/apidoc/html +%{!?_without_doc:%doc lib/apidoc/latex/refman.pdf} +%{!?_without_doc:%doc lib/apidoc/html} + + +%files python +%defattr(-,root,root,-) +%{!?_without_python:%{python_sitearch}/*} %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 + +* Tue Jun 01 2010 S.Çağlar Onur - util-vserver-0.30.216-2 +- remove tmpfs mounted /tmp from fstab template + +* Tue May 11 2010 S.Çağlar Onur - util-vserver-0.30.216-1 + +* Mon Jun 25 2007 Daniel Hokka Zakrisson - 0.30.214-0 +- updated URLs +- get rid of e2fsprogs requirement + +* Fri Dec 29 2006 Daniel Hokka Zakrisson - 0.30.213-0 +- add --with legacy and --without doc switches +- add util-vserver initscript + * Sun Jan 22 2006 Enrico Scholz - 0.30.210-0 - do not require 'xalan' anymore by default - removed 'Requires: apt'; apt-rpm is not maintained upstream anymore