Merge pull request #2908 from lindig/ppx-ely

Rebase ppx-ely on top of v1.14.5 (was v1.14.4)

Makefile

@@ -142,7 +142,7 @@ xapi.spec: xapi.spec.in
 srpm: xapi.spec
 	mkdir -p $(RPM_SOURCESDIR) $(RPM_SPECSDIR) $(RPM_SRPMSDIR)
 	while ! [ -d .git ]; do cd ..; done; \
-	git archive --prefix=xapi-1.14.4/ --format=tar HEAD | bzip2 -z > $(RPM_SOURCESDIR)/xapi-1.14.4.tar.bz2 # xen-api/Makefile
+	git archive --prefix=xapi-1.14.5/ --format=tar HEAD | bzip2 -z > $(RPM_SOURCESDIR)/xapi-1.14.5.tar.bz2 # xen-api/Makefile
 	cp $(JQUERY) $(JQUERY_TREEVIEW) $(RPM_SOURCESDIR)
 	make -C $(REPO) version
 	rm -f $(RPM_SOURCESDIR)/xapi-version.patch

scripts/extensions/pool_update.apply

@@ -44,7 +44,7 @@ def failure_message(code, params):
 
 
 def execute_apply(session, update_package, yum_conf_file):
-    cmd = ['yum', 'install', '-y', '--noplugins', '-c', yum_conf_file, update_package]
+    cmd = ['yum', 'upgrade', '-y', '--noplugins', '-c', yum_conf_file, update_package]
     yum_env = os.environ.copy()
     yum_env['LANG'] = 'C'
     p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True, env=yum_env)

xapi.spec.in

@@ -2,7 +2,7 @@
 
 Summary: xapi - xen toolstack for XCP
 Name:    xapi
-Version: 1.14.4
+Version: 1.14.5
 Release: @RPM_RELEASE@
 Group:   System/Hypervisor
 License: LGPL+linking exception