packages: util-vserver/util-vserver-pld.patch, util-vserver/util-vserver.sp...

[arekm]

Author: arekm                        Date: Tue May 31 13:10:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.30.216-1.pre2967

---- Files affected:
packages/util-vserver:
   util-vserver-pld.patch (1.43 -> 1.44) , util-vserver.spec (1.279 -> 1.280) , util-vserver-git.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/util-vserver/util-vserver-pld.patch
diff -u packages/util-vserver/util-vserver-pld.patch:1.43 packages/util-vserver/util-vserver-pld.patch:1.44
--- packages/util-vserver/util-vserver-pld.patch:1.43	Wed Sep  9 08:07:04 2009
+++ packages/util-vserver/util-vserver-pld.patch	Tue May 31 15:10:05 2011
@@ -314,9 +314,9 @@
  function _pkgMountBase
  {
 @@ -476,6 +490,7 @@
- 	    rpm)	_pkgSetVarsRPM;;
  	    apt)	_pkgSetVarsApt;;
  	    yum)	_pkgSetVarsYum;;
+ 	    urpmi)	_pkgSetVarsUrpmi;;
 +	    poldek)	_pkgSetVarsPoldek;;
  	    *)		echo "Unknown packaging flavor" >&2; exit 1;;
  	esac
@@ -404,8 +404,8 @@
  "
      
      case $2 in
--	(RH)	pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
-+	(RH)	pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
+-	(RH)	pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi "${YUM_RELEASEPKGS[@]}")
++	(RH)	pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi poldek "${YUM_RELEASEPKGS[@]}")
  		hasSubstring "$pkgs" ---rpm--- || {
  		    warning "$ERR
  * The vserver does not seem to have the 'rpm' package which is required
@@ -413,8 +413,8 @@
  		    ERR=
  		}
  		
--		hasSubstring "$pkgs"  ---apt--- ---yum--- || {
-+		hasSubstring "$pkgs"  ---apt--- ---yum--- ---poldek--- || {
+-		hasSubstring "$pkgs"  ---apt--- ---yum--- ---urpmi--- || {
++		hasSubstring "$pkgs"  ---apt--- ---yum--- ---urpmi--- ---poldek--- || {
  		    warning "$ERR
 -* The vserver does not seem to have a depsolver like 'apt' or 'yum'
 +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
@@ -755,9 +755,9 @@
 --- util-vserver-0.30.216-r2837.orig/scripts/vserver-build	2009-06-22 17:36:34.000000000 +0200
 +++ util-vserver-0.30.216-r2837/scripts/vserver-build	2009-06-22 17:48:26.000000000 +0200
 @@ -57,6 +57,9 @@
-     yum         ... -- -d <distribution>
                  ...  installs the base-packages of the given distribution with
  		     help of 'vyum'
+     urpmi       ... -- -d <distribution> -m <mirror>
 +    poldek      ... -- -d <distribution>
 +                ...  installs the base-packages of the given distribution with
 +		     help of 'vpoldek'
@@ -768,8 +768,8 @@
  
  case x"$method" in
      (xlegacy)	exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
--    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
-+    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek)
+-    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi)
++    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi|xpoldek)
  		. $__PKGLIBDIR/vserver-build.$method
  		;;
      (x)		panic $"No build-method specified";;

================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.279 packages/util-vserver/util-vserver.spec:1.280
--- packages/util-vserver/util-vserver.spec:1.279	Wed Mar 30 13:33:54 2011
+++ packages/util-vserver/util-vserver.spec	Tue May 31 15:10:05 2011
@@ -19,8 +19,8 @@
 %undefine	with_doc
 %endif
 
-%define		snap	pre2955
-%define		rel	3
+%define		snap	pre2967
+%define		rel	1
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
@@ -29,7 +29,7 @@
 License:	GPL
 Group:		Applications/System
 Source0:	http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5:	13c3846810be19d9d5436a1825d23821
+# Source0-md5:	88a04dd86435bd26da067e7c85f394b8
 Source1:	vprocunhide.init
 Source2:	vservers.init
 Source3:	vservers-legacy.init
@@ -74,7 +74,6 @@
 Patch22:	%{name}-pivot-root-ugly-hack.patch
 Patch24:	vunify-more-exclude.patch
 Patch25:	stat.patch
-Patch26:	%{name}-git.patch
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.9
@@ -404,7 +403,6 @@
 %patch22 -p1
 %patch24 -p1
 %patch25 -p1
-%patch26 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -726,6 +724,7 @@
 %attr(755,root,root) %{_sbindir}/vtag
 %attr(755,root,root) %{_sbindir}/vtop
 %attr(755,root,root) %{_sbindir}/vuname
+%attr(755,root,root) %{_sbindir}/vurpm
 %attr(755,root,root) %{_sbindir}/vwait
 %attr(755,root,root) %{_sbindir}/vyum
 %dir %{_libdir}/%{name}
@@ -784,6 +783,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/vprocunhide
 %attr(755,root,root) %{_libdir}/%{name}/vrpm-*
 %attr(755,root,root) %{_libdir}/%{name}/vserver-build
+%attr(755,root,root) %{_libdir}/%{name}/vurpm-worker
 %{_libdir}/%{name}/vserver-build.*
 %{_libdir}/%{name}/vserver-setup.functions
 %{_libdir}/%{name}/vserver.*
@@ -949,6 +949,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.280  2011/05/31 13:10:05  arekm
+- up to 0.30.216-1.pre2967
+
 Revision 1.279  2011/03/30 11:33:54  arekm
 - rel 3; support for subdir per cgroup subsystem (default mount way used by libcgroup)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver-pld.patch?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver.spec?r1=1.279&r2=1.280&f=u