X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt.spec;h=7b7de1733868508d04d71f0e18d12e35f675b9a3;hb=7470b860cfb9847023a18a90d640e4ed229e6310;hp=aacb4a8f980caa4ac20ac2971c261679d361414d;hpb=27c0d958f2db352502694bba430a157ad1610182;p=packages%2Flibvirt.git diff --git a/libvirt.spec b/libvirt.spec index aacb4a8..7b7de17 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -11,7 +11,6 @@ %bcond_without openvz # OpenVZ support %bcond_without phyp # PHYP support %bcond_without qemu # Qemu support -%bcond_without uml # UML support %bcond_without vbox # VirtualBox support %bcond_without vmware # VMware Workstation/Player support %bcond_without xenapi # Xen API (Citrix XenServer) support @@ -41,12 +40,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 4.5.0 -Release: 2 +Version: 5.1.0 +Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: 692b2d00907438ed08a68813d3177cd3 +# Source0-md5: 74c6c2e90ca9c94d9255eec338615a0c Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init @@ -106,7 +105,6 @@ BuildRequires: udev-devel >= 1:218 %{?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 @@ -121,6 +119,7 @@ Obsoletes: libvirt-daemon-esx Obsoletes: libvirt-daemon-hyperv Obsoletes: libvirt-daemon-openvz Obsoletes: libvirt-daemon-phyp +Obsoletes: libvirt-daemon-uml Obsoletes: libvirt-daemon-vbox Obsoletes: libvirt-daemon-vmware Obsoletes: libvirt-daemon-xen @@ -183,7 +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} -Requires: yajl-devel %description devel Libvirt is a C toolkit to interact with the virtualization @@ -360,21 +358,6 @@ of the QEMU emulators. Sterownik wymagany po stronie serwera do zarządzania funkcjami wirtualizacji emulatora QEMU. -%package daemon-uml -Summary: Server side driver required to run UML guests -Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości UML -Group: Libraries -Requires: %{name}-daemon = %{version}-%{release} -Provides: libvirt(hypervisor) - -%description daemon-uml -Server side driver required to manage the virtualization capabilities -of UML. - -%description daemon-uml -l pl.UTF-8 -Sterownik wymagany po stronie serwera do zarządzania funkcjami -wirtualizacji UML. - %package client Summary: Client side utilities of the libvirt library Summary(pl.UTF-8): Narzędzia klienckie do biblioteki libvirt @@ -403,7 +386,6 @@ Requires: %{name}-daemon = %{version}-%{release} %{?with_libxl:Requires: %{name}-daemon-libxl = %{version}-%{release}} Requires: %{name}-daemon-lxc = %{version}-%{release} Requires: %{name}-daemon-qemu = %{version}-%{release} -%{?with_uml:Requires: %{name}-daemon-uml = %{version}-%{release}} %description utils Libvirt is a C toolkit to interact with the virtualization @@ -538,13 +520,11 @@ Moduł sekcji Wiresharka do pakietów libvirt. --with-sasl \ --with-selinux \ --with-udev \ - %{__with_without uml} \ %{__with_without vbox vbox %{_libdir}/VirtualBox} \ --with-virtualport \ %{__with_without vmware} \ %{!?with_wireshark:--without-wireshark-dissector} \ %{__with_without xenapi} \ - --with-yajl \ --x-libraries=%{_libdir} %{__make} \ @@ -575,8 +555,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a} %endif %if %{with wireshark} -%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la \ - %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.a} \ +%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.la \ + %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.a} \ %endif rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/{bal,ilo,kw@kkcor,kw@uccor,kw_GB,tw,wba} @@ -677,7 +657,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 @@ -739,7 +721,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 @@ -820,16 +802,6 @@ fi %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so %endif -%if %{with uml} -%files daemon-uml -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_uml.so -%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.uml -%attr(700,root,root) %dir /var/lib/libvirt/uml -%attr(700,root,root) %dir /var/run/libvirt/uml -%attr(700,root,root) %dir /var/log/libvirt/uml -%endif - %files client %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests @@ -884,5 +856,5 @@ fi %if %{with wireshark} %files -n wireshark-libvirt %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/wireshark/plugins/*/libvirt.so +%attr(755,root,root) %{_libdir}/wireshark/plugins/*/epan/libvirt.so %endif