From 1b1bd491ee9437b552bf5270cf8175876432c842 Mon Sep 17 00:00:00 2001 From: Rosa Date: Thu, 2 Feb 2012 01:30:48 +0400 Subject: [PATCH] Automatic import for version 0.8.2 --- drakvirt.spec | 30 +++++++++++++----------------- xen.pm.patch | 11 +++++++++++ 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 xen.pm.patch diff --git a/drakvirt.spec b/drakvirt.spec index dab699e..8a24b4c 100644 --- a/drakvirt.spec +++ b/drakvirt.spec @@ -1,12 +1,13 @@ %define name drakvirt %define version 0.8.2 -%define release %mkrel 2 +%define release %mkrel 3 Summary: Virtualization configuration Name: %{name} Version: %{version} Release: %{release} Source0: %{name}-%{version}.tar.bz2 +Patch: xen.pm.patch License: GPL Group: System/Configuration/Other Url: https://svn.mandriva.com/svn/soft/drakvirt/trunk/ @@ -19,6 +20,7 @@ This tool allows to configure virtualization using Xen. %prep %setup -q +%patch -p0 %build %make @@ -55,6 +57,10 @@ rm -rf %{buildroot} %changelog +* Mon Sep 12 2011 Sergey Zhemoitel 0.8.2-3mdv2012.0 ++ Revision: 699571 +- fix requires for xen + * Sun Dec 05 2010 Oden Eriksson 0.8.2-2mdv2011.0 + Revision: 610275 - rebuild @@ -88,47 +94,37 @@ rm -rf %{buildroot} - translation updates - kill re-definition of %%buildroot on Pixel's request - + Olivier Blin + + Olivier Blin - restore BuildRoot * Thu Oct 04 2007 Thierry Vignaud 0.6-1mdv2008.0 + Revision: 95424 - hide menu entry since our tools are accessible through mcc -* Wed Oct 03 2007 Olivier Blin 0.5-1mdv2008.0 +* Wed Oct 03 2007 Olivier Blin 0.5-1mdv2008.0 + Revision: 95249 - add icon in iconsdir - 0.5 - use drakvirt icon in menu entry -* Fri Sep 28 2007 Olivier Blin 0.4-2mdv2008.0 +* Fri Sep 28 2007 Olivier Blin 0.4-2mdv2008.0 + Revision: 93783 - fix drakxtools requires -* Fri Sep 28 2007 Olivier Blin 0.4-1mdv2008.0 +* Fri Sep 28 2007 Olivier Blin 0.4-1mdv2008.0 + Revision: 93740 - require a new drakxtools version to allow asking for directory - 0.4 - ask for a directory in the "Installer path" dialog (#30202, #34278) -* Sun Sep 23 2007 Olivier Blin 0.3-1mdv2008.0 +* Sun Sep 23 2007 Olivier Blin 0.3-1mdv2008.0 + Revision: 92374 - 0.3: do not require lilo to be installed -* Mon Sep 17 2007 Olivier Blin 0.2-1mdv2008.0 +* Mon Sep 17 2007 Olivier Blin 0.2-1mdv2008.0 + Revision: 89161 - 0.2 - adapt to kernel-xen naming and do not rebuild initrd (#30509) - install mbootpack before xen (since xen pulls kernel-xen) - install mbootpack only if lilo is used - -* Fri Mar 23 2007 Olivier Blin 0.1.1-1mdv2007.1 -+ Revision: 148287 -- 0.1.1: rename icons for MCC (#29825) - -* Thu Mar 15 2007 Olivier Blin 0.1-1mdv2007.1 -+ Revision: 144066 -- initial release -- Create drakvirt - diff --git a/xen.pm.patch b/xen.pm.patch new file mode 100644 index 0000000..02957c4 --- /dev/null +++ b/xen.pm.patch @@ -0,0 +1,11 @@ +--- lib/virtual/xen.pm.old 2007-09-28 22:32:22.000000000 +0400 ++++ lib/virtual/xen.pm 2011-09-12 23:58:57.000000000 +0400 +@@ -127,7 +127,7 @@ + sub run_guest_installer { + my ($self, $in) = @_; + +- $in->do_pkgs->ensure_are_installed([ 'xorg-x11-Xnest', 'curl' ]) or return; ++ $in->do_pkgs->ensure_are_installed([ 'x11-server-xnest', 'curl' ]) or return; + + require File::Temp; + (undef, my $defcfg) = File::Temp::tempfile(undef, OPEN => 0);