X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt.spec;h=72d51c1ef3d635a9c125cd43e4d2328dfdcc561c;hp=28360830cc24a50808f87c83e97122bc93f71cc0;hb=0ea9edf4f2a72c1ba8d5786fe4b3c00e499f63a1;hpb=f08e2de848020f421ff12e52ee56c58506abe1f6 diff --git a/libvirt.spec b/libvirt.spec index 2836083..72d51c1 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -15,7 +15,6 @@ %bcond_without vbox # VirtualBox support %bcond_without vmware # VMware Workstation/Player support %bcond_without xenapi # Xen API (Citrix XenServer) support -%bcond_without xen # Xen support # - storage %bcond_without ceph # RADOS BD (Ceph) storage support %bcond_without glusterfs # GlusterFS storage support @@ -35,7 +34,6 @@ # Xen is available only on x86 and ia64 %ifnarch %{ix86} %{x8664} ia64 -%undefine with_xen %undefine with_xenapi %undefine with_libxl %endif @@ -43,12 +41,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 4.0.0 +Version: 4.8.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: ff0dbdd8ec4ac1277588dfe3b245d0e9 +# Source0-md5: b9f257b80404e8bbc165cefb72b696a0 Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init @@ -105,11 +103,9 @@ BuildRequires: rpmbuild(macros) >= 1.627 %{?with_systemtap:BuildRequires: systemtap-sdt-devel} BuildRequires: udev-devel >= 1:218 %{?with_wireshark:BuildRequires: wireshark-devel >= 1.11.3} -%{?with_xen:BuildRequires: xen-devel >= 4.2} %{?with_libxl:BuildRequires: xen-devel >= 4.4} # For disk driver BuildRequires: xorg-lib-libpciaccess-devel >= 0.10.0 -BuildRequires: yajl-devel Requires: curl-libs >= 7.18.0 Requires: device-mapper >= 1.0.0 Requires: libcap-ng >= 0.4.0 @@ -126,6 +122,7 @@ Obsoletes: libvirt-daemon-openvz Obsoletes: libvirt-daemon-phyp Obsoletes: libvirt-daemon-vbox Obsoletes: libvirt-daemon-vmware +Obsoletes: libvirt-daemon-xen BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -185,8 +182,6 @@ Requires: libselinux-devel >= 2.5 Requires: libxml2-devel >= 1:2.6.0 Requires: numactl-devel %{?with_hyperv:Requires: openwsman-devel >= 2.2.3} -%{?with_xen:Requires: xen-devel >= 4.2} -Requires: yajl-devel %description devel Libvirt is a C toolkit to interact with the virtualization @@ -378,23 +373,6 @@ of UML. Sterownik wymagany po stronie serwera do zarządzania funkcjami wirtualizacji UML. -%package daemon-xen -Summary: Server side driver required to run XEN guests -Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości XEN -Group: Libraries -Requires: %{name}-daemon = %{version}-%{release} -Requires: /usr/sbin/qcow-create -Requires: xen -Provides: libvirt(hypervisor) - -%description daemon-xen -Server side driver required to manage the virtualization capabilities -of XEN. - -%description daemon-xen -l pl.UTF-8 -Sterownik wymagany po stronie serwera do zarządzania funkcjami -wirtualizacji XEN. - %package client Summary: Client side utilities of the libvirt library Summary(pl.UTF-8): Narzędzia klienckie do biblioteki libvirt @@ -424,7 +402,6 @@ Requires: %{name}-daemon = %{version}-%{release} Requires: %{name}-daemon-lxc = %{version}-%{release} Requires: %{name}-daemon-qemu = %{version}-%{release} %{?with_uml:Requires: %{name}-daemon-uml = %{version}-%{release}} -Requires: %{name}-daemon-xen = %{version}-%{release} %description utils Libvirt is a C toolkit to interact with the virtualization @@ -564,9 +541,7 @@ Moduł sekcji Wiresharka do pakietów libvirt. --with-virtualport \ %{__with_without vmware} \ %{!?with_wireshark:--without-wireshark-dissector} \ - %{__with_without xen} \ %{__with_without xenapi} \ - --with-yajl \ --x-libraries=%{_libdir} %{__make} \ @@ -589,6 +564,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la \ %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la \ + %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a} %if %{with sanlock} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \ @@ -599,6 +576,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.a} \ %endif +rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/{bal,ilo,kw@kkcor,kw@uccor,kw_GB,tw,wba} + %find_lang %{name} %clean @@ -661,6 +640,8 @@ fi %files -n bash-completion-%{name} %defattr(644,root,root,755) +/etc/bash_completion.d/virsh +/etc/bash_completion.d/virt-admin /etc/bash_completion.d/vsh %files devel @@ -693,7 +674,9 @@ fi %attr(755,root,root) %{_libexecdir}/libvirt_sanlock_helper %attr(755,root,root) %{_libdir}/libvirt/lock-driver/sanlock.so %{_datadir}/augeas/lenses/libvirt_sanlock.aug +%if %{with qemu} %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug +%endif %dir /var/lib/libvirt/sanlock %{_mandir}/man8/virt-sanlock-cleanup.8* %endif @@ -755,7 +738,7 @@ fi %dir /var/run/libvirt/network %attr(755,root,root) %{_libexecdir}/libvirt_leaseshelper %dir %{_libdir}/libvirt/connection-driver -%{_datadir}/libvirt/cpu_map.xml +%{_datadir}/libvirt/cpu_map %{?with_netcf:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so} %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_network.so %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so @@ -775,11 +758,14 @@ fi %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so +%dir %{_libdir}/libvirt/storage-file +%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so %if %{with glusterfs} %files daemon-storage-gluster %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so +%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so %endif %if %{with ceph} @@ -843,12 +829,6 @@ fi %attr(700,root,root) %dir /var/log/libvirt/uml %endif -%if %{with xen} -%files daemon-xen -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_xen.so -%endif - %files client %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests @@ -880,6 +860,8 @@ fi %{_datadir}/libvirt/schemas/networkcommon.rng %{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/nwfilter.rng +%{_datadir}/libvirt/schemas/nwfilter_params.rng +%{_datadir}/libvirt/schemas/nwfilterbinding.rng %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storagecommon.rng %{_datadir}/libvirt/schemas/storagepool.rng @@ -895,7 +877,7 @@ fi %defattr(644,root,root,755) %{_datadir}/systemtap/tapset/libvirt_functions.stp %{_datadir}/systemtap/tapset/libvirt_probes.stp -%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp +%{?with_qemu:%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp} %endif %if %{with wireshark}