Author: baggins Date: Thu Jun 30 15:43:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged core with main package (it was unneedded entity) - cleaned up duplicate %%files
---- Files affected: SPECS: util-vserver.spec (1.54 -> 1.55) ---- Diffs: ================================================================ Index: SPECS/util-vserver.spec diff -u SPECS/util-vserver.spec:1.54 SPECS/util-vserver.spec:1.55 --- SPECS/util-vserver.spec:1.54 Thu Jun 30 17:21:55 2005 +++ SPECS/util-vserver.spec Thu Jun 30 17:43:50 2005 @@ -9,9 +9,9 @@ Summary(pl): Narzędzia dla linuksowych serwerów wirtualnych Name: util-vserver Version: 0.30.207 -Release: 5.1 +Release: 5.2 License: GPL -Group: Base +Group: Applications/System Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%{name}-%{version}.tar.bz2 # Source0-md5: 1c8457a687643ae8a7b1f1d34ebbdd68 Source1: vprocunhide.init @@ -44,10 +44,10 @@ %{?with_xalan:BuildRequires: xalan-j} %endif PreReq: rc-scripts -Requires(post): %{name}-core +Requires: util-linux Requires(post,preun): /sbin/chkconfig -Requires: %{name}-core = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} +Obsoletes: %{name}-core BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -60,6 +60,9 @@ This requires a special kernel supporting the new new_s_context and set_ipv4root system call. +This package contains utilities which are required to communicate with +the Linux-Vserver enabled kernel. + %description -l pl Ten pakiet dostarcza składniki i szkielet do tworzenia wirtualnych serwerów. Wirtualny serwer działa wewnątrz serwera linuksowego, lecz @@ -70,6 +73,9 @@ Wymaga to specjalnego jądra obsługującego nowe wywołania systemowe new_s_context i set_ipv4root. +Ten pakiet zawiera narzędzia wymagane do komunikacji z jądrem z +włączonym mechanizmem Linux-Vserver. + %package devel Summary: Development files for Linux vserver libraries Summary(pl): Pliki programistyczne dla bibliotek linuksowego vserwera @@ -121,33 +127,6 @@ Ten pakiet zawiera biblioteki współdzielone wymagane przez wszystkie podpakiety util-vserver. -%package core -Summary: The core-utilities for util-vserver -Summary(pl): Podstawowe narzędzia dla util-vserver -Group: Applications/System -Requires: util-linux -Requires: %{name} = %{version}-%{release} - -%description core -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. - -This package contains utilities which are required to communicate with -the Linux-Vserver enabled kernel. - -%description core -l pl -util-vserver dostarcza składniki i szkielet do tworzenia wirtualnych -serwerów. Wirtualny serwer działa wewnątrz serwera linuksowego, lecz -jest od niego w dużym stopniu niezależny. Jako taki może uruchamiać -różne usługi z normalną konfiguracją. Różne vserwery nie mogą wchodzić -w interakcję z innymi ani z usługami na głównym serwerze. - -Ten pakiet zawiera narzędzia wymagane do komunikacji z jądrem z -włączonym mechanizmem Linux-Vserver. - %package build Summary: Tools which can be used to build vservers Summary(pl): Narzędzia do budowania vserverów @@ -181,10 +160,9 @@ %package init Summary: initscripts for vserver Summary(pl): Skrypty inicjalizujące dla vserwera -Group: Base +Group: Applications/System Requires(post,preun): /sbin/chkconfig Requires: %{name} = %{version}-%{release} -Requires: %{name}-core = %{version}-%{release} Requires: diffutils Requires: make Requires: rc-scripts @@ -215,7 +193,6 @@ Group: Applications/System Requires(post,preun): /sbin/chkconfig Requires: %{name} = %{version}-%{release} -Requires: %{name}-core = %{version}-%{release} Requires: rc-scripts %description legacy @@ -398,20 +375,40 @@ %{_sysconfdir}/vservers/vdirbase %{_sysconfdir}/vservers/run.rev /sbin/vshelper +%attr(755,root,root) %{_sbindir}/chbind +%attr(755,root,root) %{_sbindir}/chcontext +%attr(755,root,root) %{_sbindir}/chxid %attr(755,root,root) %{_sbindir}/exec-cd +%attr(755,root,root) %{_sbindir}/lsxid +%attr(755,root,root) %{_sbindir}/reducecap +%attr(755,root,root) %{_sbindir}/setattr +%attr(755,root,root) %{_sbindir}/showattr +%attr(755,root,root) %{_sbindir}/vattribute +%attr(755,root,root) %{_sbindir}/vcontext +%attr(755,root,root) %{_sbindir}/vdlimit +%attr(755,root,root) %{_sbindir}/vnamespace +%attr(755,root,root) %{_sbindir}/vkill +%attr(755,root,root) %{_sbindir}/vlimit %attr(755,root,root) %{_sbindir}/vdu %attr(755,root,root) %{_sbindir}/vps %attr(755,root,root) %{_sbindir}/vpstree +%attr(755,root,root) %{_sbindir}/vrsetup +%attr(755,root,root) %{_sbindir}/vsched %attr(755,root,root) %{_sbindir}/vserver +%attr(755,root,root) %{_sbindir}/vserver-info %attr(755,root,root) %{_sbindir}/vserver-stat %attr(755,root,root) %{_sbindir}/vsomething %attr(755,root,root) %{_sbindir}/vtop +%attr(755,root,root) %{_sbindir}/vuname %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/defaults +%{_libdir}/%{name}/FEATURES.txt +%{_libdir}/%{name}/util-vserver-vars %{_libdir}/%{name}/defaults/* %attr(755,root,root) %{_libdir}/%{name}/capchroot %attr(755,root,root) %{_libdir}/%{name}/chain-echo %attr(755,root,root) %{_libdir}/%{name}/check-unixfile +%attr(755,root,root) %{_libdir}/%{name}/chcontext-compat %attr(755,root,root) %{_libdir}/%{name}/chroot-* %attr(755,root,root) %{_libdir}/%{name}/exec-ulimit %attr(755,root,root) %{_libdir}/%{name}/fakerunlevel @@ -430,7 +427,14 @@ %attr(755,root,root) %{_libdir}/%{name}/vservers.grabinfo.sh %attr(755,root,root) %{_libdir}/%{name}/vshelper %attr(755,root,root) %{_libdir}/%{name}/vshelper-sync -%{_mandir}/man8/* +%{_mandir}/man8/chbind.8* +%{_mandir}/man8/chcontext.8* +%{_mandir}/man8/reducecap.8* +%{_mandir}/man8/vps.8* +%{_mandir}/man8/vpstree.8* +%{_mandir}/man8/vserver-stat.8* +%{_mandir}/man8/vserver.8* +%{_mandir}/man8/vtop.8* %attr(0,root,root) %dir /vservers %attr(755,root,root) %dir /vservers/.pkg %dir %{_localstatedir}/run/vservers @@ -460,33 +464,6 @@ %attr(754,root,root) /etc/rc.d/init.d/vprocunhide %attr(754,root,root) /etc/rc.d/init.d/vservers-default -%files core -%defattr(644,root,root,755) -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/FEATURES.txt -%{_libdir}/%{name}/util-vserver-vars -%attr(755,root,root) %{_libdir}/%{name}/chcontext-compat -%attr(755,root,root) %{_sbindir}/chbind -%attr(755,root,root) %{_sbindir}/chcontext -%attr(755,root,root) %{_sbindir}/chxid -%attr(755,root,root) %{_sbindir}/lsxid -%attr(755,root,root) %{_sbindir}/reducecap -%attr(755,root,root) %{_sbindir}/setattr -%attr(755,root,root) %{_sbindir}/showattr -%attr(755,root,root) %{_sbindir}/vattribute -%attr(755,root,root) %{_sbindir}/vcontext -%attr(755,root,root) %{_sbindir}/vdlimit -%attr(755,root,root) %{_sbindir}/vnamespace -%attr(755,root,root) %{_sbindir}/vkill -%attr(755,root,root) %{_sbindir}/vlimit -%attr(755,root,root) %{_sbindir}/vrsetup -%attr(755,root,root) %{_sbindir}/vsched -%attr(755,root,root) %{_sbindir}/vserver-info -%attr(755,root,root) %{_sbindir}/vuname -%{_mandir}/man8/chbind* -%{_mandir}/man8/chcontext* -%{_mandir}/man8/reducecap* - %files build %defattr(644,root,root,755) %doc contrib/yum*.patch package-menagament.txt @@ -527,7 +504,6 @@ %attr(755,root,root) %{_sbindir}/vpoldek %attr(755,root,root) %{_sbindir}/vrpm %attr(755,root,root) %{_sbindir}/vyum -%{_mandir}/man8/vserver-copy* %files legacy %defattr(644,root,root,755) @@ -540,9 +516,9 @@ %attr(754,root,root) /etc/rc.d/init.d/rebootmgr %attr(754,root,root) /etc/rc.d/init.d/vservers-legacy %attr(755,root,root) %{_sbindir}/vserver-copy -%{_mandir}/man8/distrib-info* -%{_mandir}/man8/rebootmgr* -%{_mandir}/man8/vps.* +%{_mandir}/man8/distrib-info.8* +%{_mandir}/man8/rebootmgr.8* +%{_mandir}/man8/vserver-copy.8* %files -n vserver-dev %defattr(644,root,root,755) @@ -562,6 +538,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.55 2005/06/30 15:43:50 baggins +- merged core with main package (it was unneedded entity) +- cleaned up duplicate %%files + Revision 1.54 2005/06/30 15:21:55 baggins - req(post) vserver-core in main package ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/util-vserver.spec?r1=1.54&r2=1.55&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
