X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt.spec;h=280b0a7ab3f7ecbcef7ed1d86e10430766c035db;hp=82516a7232f903a2d33f23f1482790cfe33333c8;hb=8318ff06bf9804545c877b5f5fcdbf83250439a4;hpb=c157a7ce8e2235ff937d9e0f9accba30e1df46ff diff --git a/libvirt.spec b/libvirt.spec index 82516a7..280b0a7 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,22 +40,25 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 4.6.0 -Release: 3 +Version: 5.5.0 +Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: 6ea17a8f004a4bcdfc4beaed91fcdddd +# Source0-md5: 27c5fb6c8d2d46eb9e8165aeb3b499b0 Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init +Source4: libvirt-guests.init +Source5: libvirtd.sysconfig +Source6: virtlockd.sysconfig +Source7: virtlogd.sysconfig +Source8: libvirt-guests.sysconfig Patch0: %{name}-sasl.patch Patch1: %{name}-qemu-acl.patch Patch2: %{name}-udevadm-settle.patch Patch3: bashisms.patch -Patch4: %{name}-guests.init.patch -Patch5: %{name}-sysctl-dir.patch -Patch6: yajl.patch +Patch4: %{name}-sysctl-dir.patch URL: http://www.libvirt.org/ BuildRequires: acl-devel BuildRequires: attr-devel @@ -121,6 +123,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 @@ -359,21 +362,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 @@ -402,7 +390,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 @@ -449,8 +436,6 @@ Moduł sekcji Wiresharka do pakietów libvirt. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build %{__libtoolize} @@ -500,7 +485,6 @@ Moduł sekcji Wiresharka do pakietów libvirt. --with-bash-completions-dir=/etc/bash_completion.d \ --with-html-dir=%{_gtkdocdir} \ --with-html-subdir=%{name} \ - --with-init-script=redhat \ --with-packager="TLD-Linux" \ --with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \ --with-qemu-user=qemu \ @@ -538,7 +522,6 @@ 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} \ @@ -560,6 +543,11 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d} install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlockd install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd +install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirt-guests +install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/libvirtd +install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/virtlockd +install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/virtlogd +install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/libvirt-guests %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \ @@ -574,8 +562,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} @@ -740,7 +728,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 @@ -821,16 +809,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 @@ -860,6 +838,7 @@ fi %{_datadir}/libvirt/schemas/interface.rng %{_datadir}/libvirt/schemas/network.rng %{_datadir}/libvirt/schemas/networkcommon.rng +%{_datadir}/libvirt/schemas/networkport.rng %{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/nwfilter.rng %{_datadir}/libvirt/schemas/nwfilter_params.rng @@ -867,6 +846,7 @@ fi %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storagecommon.rng %{_datadir}/libvirt/schemas/storagepool.rng +%{_datadir}/libvirt/schemas/storagepoolcaps.rng %{_datadir}/libvirt/schemas/storagevol.rng # for test driver (built into libvirt) %{_datadir}/libvirt/test-screenshot.png @@ -885,5 +865,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