- add some usefull suggests

[packages/ganeti.git] / ganeti.spec

diff --git a/ganeti.spec b/ganeti.spec
index 4156d64f8a1bf780633165b5fcb52c197acf1789..ed3fd305810586a086cb2488e51b806349303c79 100644 (file)
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -1,7 +1,7 @@
 Summary:       Cluster-based virtualization management software
 Name:          ganeti
 Version:       2.9.3
-Release:       0.6
+Release:       0.10
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.ganeti.org/releases/2.9/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Patch0:               fix-no-kvm.patch
 Patch1:                systemd.patch
 Patch2:                daemon-util-use-service.patch
 Patch3:                mtl.patch
+Patch4:                use-vm-openvswitch-link.patch
 URL:           https://code.google.com/p/ganeti/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -84,7 +85,9 @@ Requires:     rc-scripts
 Requires:      socat
 Requires:      sudo
 Requires:      systemd-units >= 0.38
-#Suggests:     ganeti-instance-debootstrap
+Suggests:      ganeti-instance-debootstrap
+Suggests:      ganeti-instance-poldek
+Suggests:      openvswitch
 Suggests:      qemu
 Suggests:      xen
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -123,6 +126,7 @@ bash-completion for ganeti.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal} -I autotools
@@ -156,7 +160,7 @@ bash-completion for ganeti.
 %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,sudoers.d}
+       $RPM_BUILD_ROOT/etc/{ganeti,cron.d,bash_completion.d,sysconfig,rc.d/init.d,sudoers.d,logrotate.d}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -180,6 +184,8 @@ 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-{noded,masterd,rapi,confd,luxid,mond}.service $RPM_BUILD_ROOT%{systemdunitdir}
 cp -p doc/examples/ganeti.sudoers $RPM_BUILD_ROOT/etc/sudoers.d/ganeti
+cp -p doc/examples/ganeti.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/ganeti
+cp -p doc/examples/gnt-config-backup $RPM_BUILD_ROOT%{_sbindir}
 
 %py_postclean
 
@@ -266,6 +272,7 @@ fi
 %{systemdunitdir}/ganeti-rapi.service
 %{systemdtmpfilesdir}/ganeti.conf
 /etc/cron.d/ganeti
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ganeti
 %dir %{_datadir}/ganeti
 %dir %{_datadir}/ganeti/extstorage
 %dir %{_datadir}/ganeti/os
@@ -276,8 +283,8 @@ fi
 %attr(755,root,root) %{_libdir}/ganeti/import-export
 %attr(755,root,root) %{_libdir}/ganeti/kvm-ifup
 %attr(755,root,root) %{_libdir}/ganeti/mon-collector
-%attr(755,root,root) %{_libdir}/ganeti/node-daemon-setup
 %attr(755,root,root) %{_libdir}/ganeti/net-common
+%attr(755,root,root) %{_libdir}/ganeti/node-daemon-setup
 %attr(755,root,root) %{_libdir}/ganeti/prepare-node-join
 %attr(755,root,root) %{_libdir}/ganeti/vif-ganeti
 %dir %{_libdir}/ganeti/extstorage
@@ -312,6 +319,7 @@ fi
 %attr(755,root,root) %{_sbindir}/ganeti-watcher
 %attr(755,root,root) %{_sbindir}/gnt-backup
 %attr(755,root,root) %{_sbindir}/gnt-cluster
+%attr(755,root,root) %{_sbindir}/gnt-config-backup
 %attr(755,root,root) %{_sbindir}/gnt-debug
 %attr(755,root,root) %{_sbindir}/gnt-group
 %attr(755,root,root) %{_sbindir}/gnt-instance
@@ -371,6 +379,9 @@ fi
 %{py_sitescriptdir}/ganeti/utils/*.py*
 %dir %{py_sitescriptdir}/ganeti/watcher
 %{py_sitescriptdir}/ganeti/watcher/*.py*
+%dir %attr(755,gnt-masterd,gnt-masterd) /var/lib/ganeti
+%dir %attr(770,gnt-masterd,gnt-daemons) /var/log/ganeti
+%dir %attr(775,gnt-masterd,gnt-daemons) /var/run/ganeti
 
 %files htools
 %defattr(644,root,root,755)