X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=0d8c9548996778dbcbec2095b59b85b3781490b0;hb=c574f33e210c3438945209d685c218c51f74cbaa;hp=7fadae3ac016a5a7bb5f80559aa8ce313d6fa8ce;hpb=9cde6b2e1f86d390b0730cb5339eb4920d631886;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 7fadae3..0d8c954 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -1,7 +1,10 @@ # $Id$ %define confdir %_sysconfdir/vservers +%define confdefaultdir %confdir/.defaults %define pkglibdir %_libdir/%name +%define __chattr /usr/bin/chattr +%define chkconfig /sbin/chkconfig Summary: Linux virtual server utilities Name: @PACKAGE@ @@ -13,26 +16,64 @@ 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 BuildRoot: %_tmppath/%name-%version-%release-root -#Requires: util-vserver-core = %epoch:%version-%release +Requires: init(@PACKAGE@) +Requires: %name-core = %epoch:%version-%release +Requires: %name-lib = %epoch:%version-%release +Requires: diffutils mktemp sed Provides: vserver = %epoch:%version-%release -Conflicts: vserver < %epoch:%version +Obsoletes: vserver < %epoch:%version BuildRequires: mount vconfig gawk iproute -BuildRequires: dietlibc gcc-c++ +BuildRequires: gcc-c++ wget +BuildRequires: e2fsprogs-devel +BuildRequires: doxygen tetex-latex libxslt +Requires(post): %__chattr +Requires(pre): %pkglibdir +Requires(postun): %pkglibdir +%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.24} + +%package lib +Summary: Dynamic libraries for util-vserver +Group: System Environment/Libraries %package core -Summary: The core-utilities for util-vserver -Group: Applications/System +Summary: The core-utilities for util-vserver +Group: Applications/System +Requires: util-linux + +%package build +Summary: Tools which can be used to build vservers +Group: Applications/System +Requires: rpm apt wget binutils tar e2fsprogs +Requires: %name = %epoch:%version-%release +Requires(pre): %confdir +Requires(postun): %confdir %package sysv -Summary: SysV-initscripts for vserver -Group: System Environment/Base -Requires: %name = %epoch:%version-%release -Requires: initscripts +Summary: SysV-initscripts for vserver +Group: System Environment/Base +Provides: init(@PACKAGE@) +Requires: make diffutils +Requires: initscripts +Requires: %name = %epoch:%version-%release +Requires(post): %chkconfig +Requires(preun): %chkconfig +Requires(pre): %_initrddir %pkglibdir +requires(postun): %_initrddir %pkglibdir + +%package legacy +Summary: Legacy utilities for util-vserver +Group: Applications/System +Requires: %name = %epoch:%version-%release +Requires(post): %chkconfig +Requires(preun): %chkconfig +Requires(pre): %_initrddir %pkglibdir +requires(postun): %_initrddir %pkglibdir %package devel -Summary: Header-files and libraries which are needed to develop vserver based applications -Group: Development/Libraries -Requires: pkgconfig +Summary: Header-files and libraries which are needed to develop vserver based applications +Group: Development/Libraries +Requires: pkgconfig + %description This package provides the components and a framework to setup virtual @@ -44,93 +85,152 @@ can't interact with services in the main server. This requires a special kernel supporting the new new_s_context and set_ipv4root system call. +%description lib %description core +%description build %description sysv +%description legacy %description devel + %prep %setup -q %build -%configure -%__make %{?_smp_mflags} +%configure --with-initrddir=%_initrddir --enable-release \ + %{?_without_dietlibc:--disable-dietlibc} + +%__make %{?_smp_mflags} all +%__make %{?_smp_mflags} doc %install rm -rf $RPM_BUILD_ROOT -%__make DESTDIR="$RPM_BUILD_ROOT" install +%__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution + +rm -f $RPM_BUILD_ROOT/%_libdir/*.la + +contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat + + +%check || : +%__make check -test "%_initrddir" = %_sysconfdir/init.d || { - mkdir -p ${RPM_BUILD_ROOT}%_initrddir - mv ${RPM_BUILD_ROOT}%_sysconfdir/init.d/* ${RPM_BUILD_ROOT}%_initrddir/ -} %clean rm -rf $RPM_BUILD_ROOT -%define v_services httpd named portmap sendmail smb sshd xinetd +%post +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 /var/run/vservers.rev "$f" + +%__chattr +t /vservers || : + + +%define v_services httpd named portmap sendmail smb sshd xinetd gated %post sysv -/sbin/chkconfig --add vservers -/sbin/chkconfig --add rebootmgr +%chkconfig --add vservers-default +%chkconfig --add vprocunhide for i in %v_services; do - /sbin/chkconfig --add v_$i + %chkconfig --add v_$i done %preun sysv test "$1" != 0 || for i in %v_services; do - /sbin/chkconfig --del v_$i + %chkconfig --del v_$i done -test "$1" != 0 || %{_initrddir}/rebootmgr stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del rebootmgr -test "$1" != 0 || /sbin/chkconfig --del vservers +test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : + +test "$1" != 0 || %chkconfig --del vprocunhide +test "$1" != 0 || %chkconfig --del vservers-default %postun sysv -test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : +test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig + + +%post legacy +%chkconfig --add rebootmgr +%chkconfig --add vservers-legacy + +%preun legacy +test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : + +test "$1" != 0 || %chkconfig --del rebootmgr +test "$1" != 0 || %chkconfig --del vservers-legacy + +%postun legacy +test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : -%files +%files -f %name-base.list %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %doc doc/FAQ.txt -%pkglibdir -%_sbindir/* -%_mandir/man8/* +%doc doc/*.html doc/*.css +/sbin/vshelper %dir %confdir -%dir %confdir/.distributions -%dir %confdir/.distributions/rh* -%dir %confdir/.distributions/*/apt -%config(noreplace) %confdir/.distributions/*/apt/sources.list +%dir %confdefaultdir +%dir %confdefaultdir/apps +%dir %confdefaultdir/files +%dir %pkglibdir/defaults +%ghost %confdefaultdir/vdirbase +%ghost %confdefaultdir/run.rev + +%attr(000,root,root) %dir /vservers/.pkg +%attr(000,root,root) %dir /vservers + %dir /var/run/vservers +%dir /var/run/vservers.rev +%dir /var/run/vshelper -%if 0 -%files core + +%files lib -f %name-lib.list +%files sysv -f %name-sysv.list + + +%files core -f %name-core.list %defattr(-,root,root,-) %dir %pkglibdir -%pkglibdir/filetime -%pkglibdir/ -filetime ifspec listdevip mask2prefix readlink save_ctxinfo save_s_context secure-mount showattr showperm util-vserver-vars -chbind chcontext new-namespace reducecap setctxlimit util-vserver-vars -%endif -%files sysv +%files build -f %name-build.list %defattr(-,root,root,-) -%_initrddir/* +%dir %confdir/.distributions +%dir %confdir/.distributions/* +%dir %confdir/.distributions/*/apt +%config(noreplace) %confdir/.distributions/*/apt/sources.list + + +%files legacy -f %name-legacy.list +%defattr(-,root,root,-) +%dir %pkglibdir/legacy %config(noreplace) %_sysconfdir/vservers.conf -%files devel + +%files devel -f %name-devel.list %defattr(-,root,root,-) -%_includedir/*.h -%_libdir/*.a -%_libdir/pkgconfig/* +%doc lib/apidoc/latex/refman.pdf +%doc lib/apidoc/html + %changelog +* Mon Mar 15 2004 Enrico Scholz - 0:0.29.202-0 +- use file-list for sysv scripts also + +* Sat Mar 6 2004 Enrico Scholz - 0:0.29.198-0 +- added vprocunhide-service support +- added doxygen support +- updated Requires: + * Wed Oct 1 2003 Enrico Scholz - 0:0.23.5-0 - Initial build. -