Author: glen Date: Sun Oct 9 09:53:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - adapterized
---- Files affected: SPECS: util-vserver.spec (1.71 -> 1.72) ---- Diffs: ================================================================ Index: SPECS/util-vserver.spec diff -u SPECS/util-vserver.spec:1.71 SPECS/util-vserver.spec:1.72 --- SPECS/util-vserver.spec:1.71 Fri Oct 7 19:23:02 2005 +++ SPECS/util-vserver.spec Sun Oct 9 11:53:07 2005 @@ -1,7 +1,6 @@ # $Revision$, $Date$ # # m68k and mips are the only not supported archs -# # Conditional build: %bcond_without dietlibc # don't use dietlibc (ask for troubles) %bcond_without doc # don't build documentation which needed LaTeX @@ -24,7 +23,7 @@ Source6: vservers-legacy.sysconfig # A bit of documentation explaining package menagement # http://www.paul.sladen.org/vserver/archives/200505/0078.html -Source7: util-vserver-pkgmgmt.txt +Source7: %{name}-pkgmgmt.txt Patch0: %{name}-vsysvwrapper.patch Patch1: %{name}-pld.patch Patch2: %{name}-build-poldek.patch @@ -52,13 +51,18 @@ BuildRequires: tetex-makeindex %{?with_xalan:BuildRequires: xalan-j} %endif -PreReq: rc-scripts +Requires: rc-scripts Requires: util-linux Requires(post,preun): /sbin/chkconfig Requires: %{name}-lib = %{version}-%{release} Obsoletes: util-vserver-core BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +# for adapter +%define _usrbin /usr/bin +%define _usrsbin /usr/bin +%define _usrlib /usr/lib/util-vserver + %description This package provides the components and a framework to setup virtual servers. A virtual server runs inside a Linux server. It is @@ -228,7 +232,7 @@ Summary: /dev entries for systems in Vservers Summary(pl): Pliki specjalne /dev/* dla systemów w Vserwerach Group: Base -PreReq: setup >= 2.4.1-2 +Requires: setup >= 2.4.1-2 Provides: dev = 2.9.0-19 Provides: devfs AutoReqProv: no @@ -279,12 +283,12 @@ PS=/bin/ps \ UMOUNT=/bin/umount \ IP=/sbin/ip \ - IPTABLES=/usr/sbin/iptables \ + IPTABLES=%{_usrsbin}/iptables \ MODPROBE=/sbin/modprobe \ NAMEIF=/sbin/nameif \ RMMOD=/sbin/rmmod \ VCONFIG=/sbin/vconfig \ - WGET=/usr/bin/wget \ + WGET=%{_usrbin}/wget \ %{__make} all %{?with_doc:%{__make} doc} @@ -296,31 +300,31 @@ %{__make} install install-distribution \ DESTDIR=$RPM_BUILD_ROOT -install vserver-compat.h $RPM_BUILD_ROOT%{_includedir}/ +cp -a vserver-compat.h $RPM_BUILD_ROOT%{_includedir} chmod -R +rX $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/* -install -d $RPM_BUILD_ROOT/etc/vservices +install -d $RPM_BUILD_ROOT%{_sysconfdir}/vservices install -d $RPM_BUILD_ROOT/vservers/.pkg ln -s /vservers $RPM_BUILD_ROOT%{_sysconfdir}/vservers/vdirbase ln -s %{_localstatedir}/run/vservers.rev $RPM_BUILD_ROOT%{_sysconfdir}/vservers/run.rev for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do s=`basename $i | sed s/v_//` - cat >$RPM_BUILD_ROOT/etc/vservices/$s << EOF + cat >$RPM_BUILD_ROOT%{_sysconfdir}/vservices/$s << EOF # IP addresses/interfaces to bound $s service to #IP=10.0.0.1 #IP=eth0 EOF done -sed 's|/usr/lib/util-vserver|%{_libdir}/%{name}|g' %{SOURCE1} > \ +sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE1} > \ $RPM_BUILD_ROOT/etc/rc.d/init.d/vprocunhide -sed 's|/usr/lib/util-vserver|%{_libdir}/%{name}|g' %{SOURCE2} > \ +sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE2} > \ $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default -sed 's|/usr/lib/util-vserver|%{_libdir}/%{name}|g' %{SOURCE3} > \ +sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE3} > \ $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy -sed 's|/usr/lib/util-vserver|%{_libdir}/%{name}|g' %{SOURCE4} > \ +sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE4} > \ $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/vservers-default @@ -468,7 +472,7 @@ %{_mandir}/man8/vserver-stat.8* %{_mandir}/man8/vserver.8* %{_mandir}/man8/vtop.8* -%attr(0,root,root) %dir /vservers +%attr(000,root,root) %dir /vservers %attr(755,root,root) %dir /vservers/.pkg %dir %{_localstatedir}/run/vservers %dir %{_localstatedir}/run/vservers.rev @@ -510,8 +514,8 @@ %dir %{_sysconfdir}/vservers/.distributions/pld2.0 %dir %{_sysconfdir}/vservers/.distributions/pld2.0/poldek %{_sysconfdir}/vservers/.distributions/pld1.99 -%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/vservers/.distributions/[frs]*/apt/sources.list -%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/vservers/.distributions/pld2.0/poldek/poldek.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/[frs]*/apt/sources.list +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld2.0/poldek/poldek.conf %attr(755,root,root) %{_libdir}/%{name}/rpm-fake* %dir %{_libdir}/%{name}/distributions %attr(-, root, root) %{_libdir}/%{name}/distributions/* @@ -537,8 +541,8 @@ %files legacy %defattr(644,root,root,755) -%dir /etc/vservices -/etc/vservices/* +%dir %{_sysconfdir}/vservices +%{_sysconfdir}/vservices/* %dir %{_libdir}/%{name}/legacy %attr(755,root,root) %{_libdir}/%{name}/legacy/* %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers-legacy @@ -568,6 +572,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.72 2005/10/09 09:53:07 glen +- adapterized + Revision 1.71 2005/10/07 17:23:02 glen - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/util-vserver.spec?r1=1.71&r2=1.72&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
