X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=23becca5fd693c999567d858f29bfe96da9c8096;hb=ab198dcb10b2c6b0e445a59af00dc292207454f3;hp=7d5ab6e4d56409941d2101a18c87677fb49d1e4f;hpb=259ceda0ea720f1bd8c93068e78667c3599bf8d4;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 7d5ab6e..23becca 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -3,6 +3,8 @@ %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@ @@ -16,13 +18,21 @@ Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%n BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(@PACKAGE@) Requires: %name-core = %epoch:%version-%release +Requires: %name-lib = %epoch:%version-%release +Requires: make Provides: vserver = %epoch:%version-%release Obsoletes: vserver < %epoch:%version BuildRequires: mount vconfig gawk iproute -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ wget BuildRequires: e2fsprogs-devel +BuildRequires: doxygen tetex-latex libxslt +Requires(post): %__chattr %{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.22} +%package lib +Summary: Dynamic libraries for util-vserver +Group: System Environment/Libraries + %package core Summary: The core-utilities for util-vserver Group: Applications/System @@ -31,7 +41,7 @@ Group: Applications/System Summary: Tools which can be used to build vservers Group: Applications/System Requires: %name = %epoch:%version-%release -Requires: rpm apt +Requires: rpm apt wget binutils tar %package sysv Summary: SysV-initscripts for vserver @@ -39,6 +49,12 @@ Group: System Environment/Base Provides: init(@PACKAGE@) Requires: %name = %epoch:%version-%release Requires: initscripts +Requires(pre,postun): %_initrddir + +%package legacy +Summary: Legacy utilities for util-vserver +Group: Applications/System +Requires: %name = %epoch:%version-%release %package devel Summary: Header-files and libraries which are needed to develop vserver based applications @@ -56,9 +72,11 @@ 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 @@ -69,7 +87,9 @@ set_ipv4root system call. %build %configure --with-initrddir=%_initrddir --enable-release \ %{?_without_dietlibc:--disable-dietlibc} -%__make %{?_smp_mflags} + +%__make %{?_smp_mflags} all +%__make %{?_smp_mflags} doc %install @@ -78,6 +98,12 @@ rm -rf $RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%_libdir/*.la +contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat + + +%check || : +%__make check + %clean rm -rf $RPM_BUILD_ROOT @@ -87,67 +113,48 @@ rm -rf $RPM_BUILD_ROOT 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 %post sysv -/sbin/chkconfig --add vservers -/sbin/chkconfig --add rebootmgr +%chkconfig --add vservers +%chkconfig --add rebootmgr +%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 || %_initrddir/rebootmgr stop &>/dev/null || : + +test "$1" != 0 || %chkconfig --del vprocunhide +test "$1" != 0 || %chkconfig --del rebootmgr +test "$1" != 0 || %chkconfig --del vservers %postun sysv -test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : +test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : +test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : -%post core -p /sbin/ldconfig -%postun core -p /sbin/ldconfig +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig -%files +%files -f %name-base.list %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %doc doc/FAQ.txt -%pkglibdir -%exclude %pkglibdir/distributions -%exclude %pkglibdir/distrib-info -%exclude %pkglibdir/rpm-fake.so -%exclude %pkglibdir/util-vserver-vars -%exclude %pkglibdir/vapt-get* -%exclude %pkglibdir/vrpm* -%exclude %pkglibdir/vserver-build* -%exclude %pkglibdir/vserver-setup* -%exclude %pkglibdir/vunify -%_sbindir/exec-cd -%_sbindir/rebootmgr -%_sbindir/vdu -%_sbindir/vfiles -%_sbindir/vlimit -%_sbindir/vps -%_sbindir/vpstree -%_sbindir/vserver -%_sbindir/vserver-stat -%_sbindir/vtop -%_mandir/*/* -%exclude %_mandir/*/chbind* -%exclude %_mandir/*/chcontext* -%exclude %_mandir/*/reducecap* -%exclude %_mandir/*/distrib-info* -%exclude %_mandir/*/vserver-copy* -%exclude %_mandir/*/vrpm* - +%doc doc/*.html doc/*.css +%dir %pkglibdir %dir %confdefaultdir %dir %confdefaultdir/init %dir %confdefaultdir/apps @@ -156,7 +163,6 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %ghost %confdefaultdir/vdirbase %ghost %confdefaultdir/run.rev - %attr(000,root,root) %dir /vservers/.pkg %attr(000,root,root) %dir /vservers @@ -164,61 +170,44 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %dir /var/run/vservers.rev -%files core +%files lib -f %name-lib.list + +%files core -f %name-core.list %defattr(-,root,root,-) -%_libdir/*.so.* -%_sbindir/chbind -%_sbindir/chcontext -%_sbindir/new-namespace -%_sbindir/reducecap -%_sbindir/vkill -%_sbindir/util-vserver-vars -%pkglibdir/util-vserver-vars -%_mandir/*/chbind* -%_mandir/*/chcontext* -%_mandir/*/reducecap* %dir %pkglibdir -%files build +%files build -f %name-build.list %defattr(-,root,root,-) -%_sbindir/vapt-get -%_sbindir/vrpm -%_sbindir/vserver-copy %dir %pkglibdir -%pkglibdir/distributions -%pkglibdir/rpm-fake.so -%pkglibdir/vapt-get* -%pkglibdir/vrpm* -%pkglibdir/vserver-build* -%pkglibdir/vserver-setup* -%pkglibdir/vunify -%_mandir/*/distrib-info* -%_mandir/*/vserver-copy* -%exclude %_mandir/*/vrpm* - %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 + %files sysv %defattr(-,root,root,-) -%_initrddir/* +%config %_initrddir/* %config(noreplace) %_sysconfdir/vservers.conf -%files devel +%files devel -f %name-devel.list %defattr(-,root,root,-) -%_includedir/*.h -%_libdir/*.a -%_libdir/*.so -%_libdir/pkgconfig/* +%doc lib/apidoc/latex/refman.pdf +%doc lib/apidoc/html %changelog +* 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. -