SPECS: util-vserver.spec - cleaned up patches - use new init scrip...

[baggins]

Author: baggins                      Date: Mon Nov  7 17:14:22 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleaned up patches
- use new init script and sysconfig

---- Files affected:
SPECS:
   util-vserver.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.82 SPECS/util-vserver.spec:1.83
--- SPECS/util-vserver.spec:1.82	Mon Nov  7 13:42:16 2005
+++ SPECS/util-vserver.spec	Mon Nov  7 18:14:16 2005
@@ -17,10 +17,10 @@
 Source0:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%{name}-%{version}.tar.bz2
 # Source0-md5:	674b122824292c20d3c53245b91f6088
 Source1:	vprocunhide.init
-Source2:	vservers-default.init
+Source2:	vservers.init
 Source3:	vservers-legacy.init
 Source4:	rebootmgr.init
-Source5:	vservers-default.sysconfig
+Source5:	vservers.sysconfig
 Source6:	vservers-legacy.sysconfig
 # A bit of documentation explaining package menagement
 # http://www.paul.sladen.org/vserver/archives/200505/0078.html
@@ -30,10 +30,9 @@
 Patch2:		%{name}-build-poldek.patch
 Patch3:		%{name}-include.patch
 Patch4:		%{name}-m4-diet.patch
-Patch7:		%{name}-cpuset.patch
-Patch8:		%{name}-build-umask.patch
-Patch10:	%{name}-mounted.patch
-Patch11:	%{name}-utmpx.patch
+Patch5:		%{name}-cpuset.patch
+Patch6:		%{name}-build-umask.patch
+Patch7:		%{name}-utmpx.patch
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.9
@@ -320,10 +319,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 %patch7 -p1
-%patch8 -p1
-#%patch10 -p1
-%patch11 -p1
 
 install %{SOURCE7} package-menagament.txt
 
@@ -384,13 +382,14 @@
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE1} > \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d/vprocunhide
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE2} > \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default
+	$RPM_BUILD_ROOT/etc/rc.d/init.d/vservers
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE3} > \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE4} > \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
+sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE5} > \
+	$RPM_BUILD_ROOT/etc/sysconfig/vservers
 
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/vservers-default
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy
 
 ln -sf null $RPM_BUILD_ROOT/dev/initctl
@@ -652,6 +651,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2005/11/07 17:14:16  baggins
+- cleaned up patches
+- use new init script and sysconfig
+
 Revision 1.82  2005/11/07 12:42:16  baggins
 - updated to 0.30.209
 - removed obsolete patches
================================================================

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