diff --git a/virt-manager.changes b/virt-manager.changes index a49fedc3..ed9921e7 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 25 09:22:04 MDT 2010 - jfehlig@novell.com + +- bnc#611023 - Use netcat-openbsd, which contains proper 'nc' + program + ------------------------------------------------------------------- Tue May 11 09:26:27 UTC 2010 - seife@opensuse.org diff --git a/virt-manager.spec b/virt-manager.spec index 71b3e438..10127c58 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -39,16 +39,15 @@ Source1: %{virtinst_name}.tar.bz2 Patch1: 1660-custom-icon-fix.patch Patch50: virtman-desktop.diff Patch51: virtman-vminstall.diff -Patch52: virtman-netcat.diff -Patch53: virtman-pointer.diff -Patch54: virtman-cdrom.diff -Patch55: virtman-kvm.diff -Patch56: virtman-bridge.diff -Patch57: virtman-manager.diff -Patch58: virtman-help.diff -Patch59: virtman-keycombo.diff -Patch60: virtman-autoconnect.diff -Patch61: virtman-device-flags.diff +Patch52: virtman-pointer.diff +Patch53: virtman-cdrom.diff +Patch54: virtman-kvm.diff +Patch55: virtman-bridge.diff +Patch56: virtman-manager.diff +Patch57: virtman-help.diff +Patch58: virtman-keycombo.diff +Patch59: virtman-autoconnect.diff +Patch60: virtman-device-flags.diff Patch81: virtinst-cdrom.diff Patch82: virtinst-storage-ocfs2.diff ExclusiveArch: %{ix86} x86_64 @@ -107,7 +106,7 @@ Requires: scrollkeeper Requires: python-gtk-vnc # Requires: librsvg added to avoid problems with minimal template Requires: librsvg -Requires: netcat +Requires: netcat-openbsd # Add requires for non Xen installations Requires: python-urlgrabber Requires: vm-install @@ -130,16 +129,15 @@ Authors: %patch1 -p1 %patch50 -p1 %patch51 -p1 -%patch52 -p1 -#%patch53 -p1 +#%patch52 -p1 +%patch53 -p1 %patch54 -p1 -%patch55 -p1 +#%patch55 -p1 #%patch56 -p1 -#%patch57 -p1 +%patch57 -p1 %patch58 -p1 %patch59 -p1 %patch60 -p1 -%patch61 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} %patch81 -p1 %patch82 -p1 diff --git a/virtman-netcat.diff b/virtman-netcat.diff deleted file mode 100644 index 950ea8f8..00000000 --- a/virtman-netcat.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: virt-manager-0.8.4/src/virtManager/console.py -=================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/console.py -+++ virt-manager-0.8.4/src/virtManager/console.py -@@ -515,11 +515,11 @@ class vmmConsolePages(gobject.GObject): - # - nc_params = "%s %s" % (vncaddr, str(vncport)) - nc_cmd = [\ -- "nc -q 2>&1 | grep -q 'requires an argument';" -+ "netcat -q 2>&1 | grep -q 'requires an argument';" - "if [ $? -eq 0 ] ; then" -- " CMD='nc -q 0 %(nc_params)s';" -+ " CMD='netcat -q 0 %(nc_params)s';" - "else" -- " CMD='nc %(nc_params)s';" -+ " CMD='netcat %(nc_params)s';" - "fi;" - "$CMD;" % {'nc_params': nc_params} - ]