X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=fff15e883bdcfa7c76e0158a58c1bb3e67c5e114;hb=eaff3f767619a50a0c5562a8ce4e2fa6b6e8c60a;hp=881c6ec8a8c15d924fb01fe9213fd494d813c683;hpb=8cf13bb177d92c93eb73dc8939777150536c2d00;p=util-vserver.git diff --git a/util-vserver.spec b/util-vserver.spec index 881c6ec..fff15e8 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,28 +1,37 @@ -# $Id: util-vserver.spec.in,v 1.49 2005/07/15 19:06:58 ensc Exp $ +# $Id: util-vserver.spec.in 2626 2007-10-16 00:27:58Z dhozac $ ## This package understands the following switches: ## --without dietlibc ... disable usage of dietlibc -## --without xalan ... do not require/use the xalan xslt processor +## --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 %global pkglibdir %_libdir/%name -%global __chattr /usr/bin/chattr %global chkconfig /sbin/chkconfig %global _localstatedir %_var +%global fullver 0.30.215 +%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 5 %{!?release_func:%global release_func() %1%{?dist}} Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.208 -Release: %release_func 0 +Version: %ver +Release: %taglevel License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2 +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 BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -33,12 +42,13 @@ Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel -BuildRequires: doxygen tetex-latex -Requires(post): %__chattr +BuildRequires: e2fsprogs +%{!?_without_doc:BuildRequires: doxygen tetex-latex} +Requires(post): %name-core Requires(pre): %pkglibdir Requires(postun): %pkglibdir %{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.25} -%{!?_without_xalan:BuildRequires: xalan-j} +%{?_with_xalan:BuildRequires: xalan-j} %package lib Summary: Dynamic libraries for util-vserver @@ -52,14 +62,11 @@ 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 - -%ifarch %ix86 -Requires: apt -%endif +Requires(post): %name-core %package sysv Summary: SysV-initscripts for vserver @@ -163,15 +170,17 @@ develop VServer related applications. %prep -%setup -q +%setup -q -n %name-%fullver %build %configure --with-initrddir=%_initrddir --enable-release \ - %{?_without_dietlibc:--disable-dietlibc} + %{?_without_dietlibc:--disable-dietlibc} \ + %{?_with_legacy:--enable-apis=NOLEGACY} \ + --with-initscripts=sysv %__make %{?_smp_mflags} all -%__make %{?_smp_mflags} doc +%{!?_without_doc:%__make %{?_smp_mflags} doc} %install @@ -185,8 +194,10 @@ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -%check || : +%if "%{?distroname}" != "fc4" +%check %__make check +%endif %clean @@ -197,10 +208,15 @@ rm -rf $RPM_BUILD_ROOT test -d /vservers || mkdir -m0000 /vservers test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg -f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f" -f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f" +f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f" +f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f" +f="%confdefaultdir/cachebase"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/cache/vservers "$f" + +%_sbindir/setattr --barrier /vservers /vservers/.pkg || : -%_sbindir/setattr --barrier /vservers || : + +%preun +test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || : %post lib -p /sbin/ldconfig @@ -210,6 +226,7 @@ f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/r %post sysv %chkconfig --add vservers-default %chkconfig --add vprocunhide +%chkconfig --add util-vserver @@ -218,13 +235,14 @@ 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 test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : -%triggerin build -- fedora-release +%triggerin build -- fedora-release, centos-release function copy() { base=$1 @@ -239,6 +257,16 @@ function copy() } copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-* copy fedora /etc/pki/rpm-gpg/RPM-GPG-* +copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-* + + +%post build +test -d /vservers/.hash || mkdir -m0700 /vservers/.hash + +f="%confdefaultdir/apps/vunify/hash"; test -e "$f"/method -o -e "$f"/00 || \ + ln -s /vservers/.hash "$f"/00 + +%_sbindir/setattr --barrier /vservers/.hash || : %preun build @@ -289,9 +317,11 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %dir %confdefaultdir/apps %dir %confdefaultdir/files %dir %pkglibdir/defaults +%ghost %confdefaultdir/cachebase %ghost %confdefaultdir/vdirbase %ghost %confdefaultdir/run.rev +%dir %_localstatedir/cache/vservers %dir %_localstatedir/run/vservers %dir %_localstatedir/run/vservers.rev %dir %_localstatedir/run/vshelper @@ -325,12 +355,48 @@ 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} %changelog +* Thu Jan 08 2009 Thierry Parmentelat - util-vserver-0.30.215-5 +- Suport for building on fedora 10 + +* Thu Apr 24 2008 Thierry Parmentelat - util-vserver-0.30.215-4 +- tweak build for fc4 + +* Fri Apr 11 2008 Daniel Hokka Zakrisson - util-vserver-0.30.215-3 +- FC4 fix. + +* 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 +- removed 'chattr' leftovers +- create the '/etc/vservers/.defaults/cachebase' symlink +- added /var/cache/vservers and the needed support +- set barrier attribute on /vservers/.pkg and /vservers/.hash +- added 'centos-release' to the list of packages in the copy-the-keys + trigger script +- create '/vservers/.hash' and add initial configuration for it + +* Sun Oct 30 2005 Enrico Scholz - 0:0.30.209-0 +- version 0.30.209 +- copy centos keys + +* Sat Jul 16 2005 Enrico Scholz - 0:0.30.208-2 +- updated URLs + * Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 +- version 0.30.208 - require the -lib subpackage by -devel - copy GPG keys from /etc/pki/rpm-gpg/