- fix from upstream for shared daemon startup code

[packages/libvirt.git] / libvirt.spec

diff --git a/libvirt.spec b/libvirt.spec
index 82b25cff93009f40d7d9eb2ad5657c48669ff4e0..a8c571d4f4d008f5879b2d0a5f4aab0e73b6e5ab 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -43,12 +43,12 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       5.8.0
-Release:       1
+Version:       6.2.0
+Release:       2
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 3f33359d42e4e996c93f6864b4a89a09
+# Source0-md5: 72f32cd93af60e5764d8ac2b11b80fa7
 Source1:       libvirtd.init
 Source2:       virtlockd.init
 Source3:       virtlogd.init
@@ -62,6 +62,7 @@ Patch1:               %{name}-qemu-acl.patch
 Patch2:                %{name}-udevadm-settle.patch
 Patch3:                bashisms.patch
 Patch4:                %{name}-sysctl-dir.patch
+Patch5:                %{name}-daemon-fix.patch
 URL:           http://www.libvirt.org/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -449,6 +450,7 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -457,7 +459,10 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %{__autoheader}
 %{__automake}
 
-%configure \
+install -d build
+cd build
+
+../%configure \
        PVCREATE=/sbin/pvcreate \
        VGCREATE=/sbin/vgcreate \
        LVCREATE=/sbin/lvcreate \
@@ -543,11 +548,13 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %{__make} \
        AWK=gawk
 
+cd ..
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
@@ -879,6 +886,9 @@ fi
 %attr(4755,root,root) %{_bindir}/virt-login-shell
 %attr(755,root,root) %{_bindir}/virt-xml-validate
 %attr(755,root,root) %{_bindir}/virt-pki-validate
+%if %{with qemu}
+%attr(755,root,root) %{_bindir}/virt-qemu-run
+%endif
 %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
 %{_libdir}/virt-login-shell-helper
 %{_mandir}/man1/virsh.1*
@@ -887,11 +897,15 @@ fi
 %{_mandir}/man1/virt-login-shell.1*
 %{_mandir}/man1/virt-xml-validate.1*
 %{_mandir}/man1/virt-pki-validate.1*
+%if %{with qemu}
+%{_mandir}/man1/virt-qemu-run.1*
+%endif
 %dir %{_datadir}/libvirt/schemas
 %{_datadir}/libvirt/schemas/basictypes.rng
 %{_datadir}/libvirt/schemas/capability.rng
 %{_datadir}/libvirt/schemas/cputypes.rng
 %{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/domainbackup.rng
 %{_datadir}/libvirt/schemas/domaincaps.rng
 %{_datadir}/libvirt/schemas/domaincheckpoint.rng
 %{_datadir}/libvirt/schemas/domaincommon.rng