Merge branch 'master' of git://git.pld-linux.org/packages/ganeti

diff --combined ganeti.spec
index 051052f32971e8e69786767840ab4d437a14838a,5b3d70e63eec345613da6bbfc7c30710875c0fc2..b8e2d2d6103cdf7e05c1262feedac105bb4dd30c
--- 1/ganeti.spec
--- 2/ganeti.spec
+++ b/ganeti.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary:      Cluster-based virtualization management software
  Name:         ganeti
  Version:      2.9.3
 -Release:      0.3
 +Release:      0.4
  License:      GPL v2
  Group:                Applications/System
  Source0:      http://downloads.ganeti.org/releases/2.9/%{name}-%{version}.tar.gz
@@@ -82,7 -82,6 +82,7 @@@ Requires:     python-pyparsin
  Requires:     python-simplejson
  Requires:     rc-scripts
  Requires:     socat
 +Requires:     sudo
  Requires:     systemd-units >= 0.38
  #Suggests:    ganeti-instance-debootstrap
  Suggests:     qemu
@@@ -132,7 -131,7 +132,7 @@@ bash-completion for ganeti
  %configure \
        IP_PATH=/sbin/ip \
        DOT=/usr/bin/dot \
-       PYCOVERAGE=/usr/bin/coverage-2.7 \
+       PYCOVERAGE=/usr/bin/coverage-%{py_ver} \
        PYLINT=/usr/bin/pylint \
        SOCAT=/usr/bin/socat \
        QEMUIMG_PATH=/usr/bin/qemu-img \
@@@ -152,7 -151,7 +152,7 @@@
  %install
  rm -rf $RPM_BUILD_ROOT
  install -d $RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}} \
 -      $RPM_BUILD_ROOT/etc/{ganeti,cron.d,bash_completion.d,sysconfig,rc.d/init.d}
 +      $RPM_BUILD_ROOT/etc/{ganeti,cron.d,bash_completion.d,sysconfig,rc.d/init.d,sudoers.d}
  
  %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@@ -174,8 -173,8 +174,8 @@@ cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sy
  cp -p doc/examples/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/ganeti
  cp -p doc/examples/ganeti.cron $RPM_BUILD_ROOT/etc/cron.d/ganeti
  cp -p doc/examples/ganeti.target $RPM_BUILD_ROOT%{systemdunitdir}
 -cp -p doc/examples/ganeti.target $RPM_BUILD_ROOT%{systemdunitdir}
  cp -p doc/examples/ganeti-{noded,masterd,rapi,confd,luxid,mond}.service $RPM_BUILD_ROOT%{systemdunitdir}
 +cp -p doc/examples/ganeti.sudoers $RPM_BUILD_ROOT/etc/sudoers.d/ganeti
  
  %py_postclean
  
@@@ -251,7 -250,6 +251,7 @@@ f
  %attr(754,root,root) /etc/rc.d/init.d/ganeti-noded
  %attr(754,root,root) /etc/rc.d/init.d/ganeti-rapi
  %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ganeti
 +%config(noreplace) %verify(not md5 mtime size) /etc/sudoers.d/ganeti
  %dir %{_sysconfdir}/ganeti
  %{systemdunitdir}/ganeti.target
  %{systemdunitdir}/ganeti-confd.service