From 86f7b894d69a1b0f6e5b0667d1b5d2146c2e7d17 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Fri, 5 Jul 2013 00:36:33 +0200
Subject: [PATCH] - 2.7.0 - files needs update

---
 daemon-util-use-service.patch |  4 ++--
 fix-no-kvm.patch              | 25 +++++++++++++++++--------
 ganeti.spec                   | 12 +++++++++---
 systemd.patch                 |  2 +-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/daemon-util-use-service.patch b/daemon-util-use-service.patch
index 74f5dfb..b3682c0 100644
--- a/daemon-util-use-service.patch
+++ b/daemon-util-use-service.patch
@@ -69,9 +69,9 @@
 -      $daemonexec $args "$@"
 -  fi
 +  /sbin/service $name start
- }
  
- # Stops a daemon
+   # FIXME: This is a workaround for issue 477. Remove this once confd does not
+   # mess up the permissions anymore.
 @@ -245,14 +208,8 @@
    fi
  
diff --git a/fix-no-kvm.patch b/fix-no-kvm.patch
index 1768e68..289e5aa 100644
--- a/fix-no-kvm.patch
+++ b/fix-no-kvm.patch
@@ -6,12 +6,21 @@ Bug: https://code.google.com/p/ganeti/issues/detail?id=250
 Last-Update: 2012-07-26
 --- a/lib/hypervisor/hv_kvm.py
 +++ b/lib/hypervisor/hv_kvm.py
-@@ -554,7 +554,7 @@
-     if hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_ENABLED:
-       kvm_cmd.extend(["-enable-kvm"])
-     elif hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_DISABLED:
--      kvm_cmd.extend(["-disable-kvm"])
-+      kvm_cmd.extend(["-no-kvm"])
+@@ -546,7 +546,7 @@
+   _SPICE_RE = re.compile(r"^-spice\s", re.M)
+   _VHOST_RE = re.compile(r"^-net\s.*,vhost=on|off", re.M)
+   _ENABLE_KVM_RE = re.compile(r"^-enable-kvm\s", re.M)
+-  _DISABLE_KVM_RE = re.compile(r"^-disable-kvm\s", re.M)
++  _DISABLE_KVM_RE = re.compile(r"^-no-kvm\s", re.M)
+   _NETDEV_RE = re.compile(r"^-netdev\s", re.M)
+   _DISPLAY_RE = re.compile(r"^-display\s", re.M)
+   _MACHINE_RE = re.compile(r"^-machine\s", re.M)
+@@ -1054,7 +1054,7 @@
+         kvm_cmd.extend(["-enable-kvm"])
+       elif (hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_DISABLED and
+             self._DISABLE_KVM_RE.search(kvmhelp)):
+-        kvm_cmd.extend(["-disable-kvm"])
++        kvm_cmd.extend(["-no-kvm"])
  
-     if boot_network:
-       kvm_cmd.extend(["-boot", "n"])
+     kernel_path = hvp[constants.HV_KERNEL_PATH]
+     if kernel_path:
diff --git a/ganeti.spec b/ganeti.spec
index 99036bb..0978840 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -1,11 +1,11 @@
 Summary:	Cluster-based virtualization management software
 Name:		ganeti
-Version:	2.6.2
+Version:	2.7.0
 Release:	0.1
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://ganeti.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	9d9a0c5c0341d5775988961449f82b99
+# Source0-md5:	c1f6a94ea4ec395325e47c16db2e5245
 Source1:	%{name}.tmpfiles
 Source2:	%{name}-confd.init
 Source3:	%{name}-masterd.init
@@ -21,17 +21,24 @@ BuildRequires:	curl-devel
 BuildRequires:	fakeroot
 BuildRequires:	gawk
 BuildRequires:	ghc
+BuildRequires:	ghc-Crypto
 BuildRequires:	ghc-QuickCheck
 BuildRequires:	ghc-curl
 BuildRequires:	ghc-haskell-platform
+BuildRequires:	ghc-hinotify
+BuildRequires:	ghc-hslogger
 BuildRequires:	ghc-json
+BuildRequires:	ghc-regex-pcre
+BuildRequires:	ghc-utf8-string
 BuildRequires:	gmp-devel
 BuildRequires:	hlint
 BuildRequires:	hscolour
 BuildRequires:	python
 BuildRequires:	python-affinity
+BuildRequires:	python-bitarray
 BuildRequires:	python-devel
 BuildRequires:	python-distribute
+BuildRequires:	python-ipaddr
 BuildRequires:	python-modules
 BuildRequires:	python-paramiko
 BuildRequires:	python-pyOpenSSL
@@ -219,7 +226,6 @@ fi
 %{_libdir}/ganeti/tools/move-instance
 %{_libdir}/ganeti/tools/ovfconverter
 %{_libdir}/ganeti/tools/sanitize-config
-%{_libdir}/ganeti/tools/setup-ssh
 %{_libdir}/ganeti/tools/xen-console-wrapper
 %attr(755,root,root) %{_sbindir}/ganeti-cleaner
 %attr(755,root,root) %{_sbindir}/ganeti-confd
diff --git a/systemd.patch b/systemd.patch
index b415fec..1b267a0 100644
--- a/systemd.patch
+++ b/systemd.patch
@@ -3,9 +3,9 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 --- ganeti-2.6.2/Makefile.am~	2012-12-21 15:38:52.000000000 +0100
 +++ ganeti-2.6.2/Makefile.am	2013-06-01 16:01:46.594026366 +0200
 @@ -149,6 +149,7 @@
- 	devel/upload \
  	$(BUILT_EXAMPLES) \
  	doc/examples/bash_completion \
+ 	doc/examples/bash_completion-debug \
 +	doc/examples/ganeti.target \
  	lib/_generated_rpc.py \
  	$(man_MANS) \
-- 
2.43.0