SPECS: util-vserver.spec - add vproc utility - trigger to remove o...

[glen]

Author: glen                         Date: Fri Mar  3 09:32:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add vproc utility
- trigger to remove old base packages from ignore list of poldek.conf

---- Files affected:
SPECS:
   util-vserver.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.107 SPECS/util-vserver.spec:1.108
--- SPECS/util-vserver.spec:1.107	Wed Mar  1 22:24:33 2006
+++ SPECS/util-vserver.spec	Fri Mar  3 10:32:39 2006
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO
 # - somewhy empty /var/cache/vservers is needed when building pld vserver
+# - make build create /dev/std{in,out,err} links
 #
 # m68k and mips are the only not supported archs
 #
@@ -9,11 +10,15 @@
 %bcond_without	doc		# don't build documentation which needed LaTeX
 %bcond_with	xalan		# use the xalan xslt processor
 #
+%define	_vproc_version 0.01
+# fails with ccache in %{__cc}
+%undefine	with_ccache
+#
 Summary:	Linux virtual server utilities
 Summary(pl):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
 Version:	0.30.210
-Release:	5
+Release:	5.2
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%{name}-%{version}.tar.bz2
@@ -30,6 +35,8 @@
 # http://www.paul.sladen.org/vserver/archives/200505/0078.html
 Source9:	%{name}-pkgmgmt.txt
 Source10:	%{name}-initpost.sh
+Source11:	http://www.13thfloor.at/vserver/s_release/v1.2.10/vproc-%{_vproc_version}.tar.bz2
+# Source11-md5:	1d030717bdbc958ea4b35fd2410dad85
 Patch0:		%{name}-vsysvwrapper.patch
 Patch1:		%{name}-pld.patch
 Patch2:		%{name}-vrpm.patch
@@ -302,7 +309,7 @@
 konfigurację w starym stylu.
 
 %prep
-%setup -q
+%setup -q -a11
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -344,6 +351,10 @@
 %{__make} all
 %{?with_doc:%{__make} doc}
 
+%{__make} -C vproc-%{_vproc_version} \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}"
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/vservers,/etc/{sysconfig,rc.d/init.d},/dev/pts}
@@ -385,6 +396,7 @@
 install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vrootdevices
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost
+install vproc-%{_vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
 
 ln -sf null $RPM_BUILD_ROOT/dev/initctl
 
@@ -447,11 +459,17 @@
 	/sbin/chkconfig --del vservers-legacy
 fi
 
-%triggerpostun build -- %{name}-build < 0.30.209-2.1
+%triggerpostun build -- %{name}-build < 0.30.210-5.2
 if [ -f /etc/vservers/.distributions/pld2.0/poldek/poldek.conf.rpmsave ]; then
 	mv -f /etc/vservers/.distributions/{pld2.0,pld-ac}/poldek/poldek.conf.rpmsave
 fi
 
+# kill old vserver specific package ignores which are no longer needed
+l=`egrep '^ignore.*(basesystem|SysVinit|rc-scripts)' /etc/vservers/*/apps/pkgmgmt/base/poldek/etc/poldek.conf -l 2>/dev/null`
+if [ "$l" ]; then
+	%{__sed} -i -e '/^ignore/s, \(basesystem\|SysVinit\|rc-scripts\),,g' $l
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS THANKS doc/intro.txt
@@ -480,6 +498,7 @@
 %attr(755,root,root) %{_sbindir}/vkill
 %attr(755,root,root) %{_sbindir}/vlimit
 %attr(755,root,root) %{_sbindir}/vdu
+%attr(755,root,root) %{_sbindir}/vproc
 %attr(755,root,root) %{_sbindir}/vps
 %attr(755,root,root) %{_sbindir}/vpstree
 %attr(755,root,root) %{_sbindir}/vrsetup
@@ -641,6 +660,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2006/03/03 09:32:39  glen
+- add vproc utility
+- trigger to remove old base packages from ignore list of poldek.conf
+
 Revision 1.107  2006/03/01 21:24:33  glen
 - use %service
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/util-vserver.spec?r1=1.107&r2=1.108&f=u