#
+# TODO:
+# - kill CFLAGS from libvirt.pc:Libs
+# - seems that lxc patch is not needed anymore, verify that before removing
+# - pldize virtlockd.init
+#
# Conditional build:
+%bcond_without ceph # RADOS BD (Ceph) storage support
%bcond_without esx # VMware ESX support
+%bcond_without glusterfs # GlusterFS storage support
%bcond_without hyperv # Hyper-V support
-%bcond_without libxl # libxenlight
+%bcond_without libxl # libxenlight support
%bcond_without lxc # LXC support
%bcond_without netcf # host interfaces support
%bcond_without openvz # OpenVZ support
%bcond_without phyp # PHYP support
-%bcond_without polkit # PolicyKit
-%bcond_without qemu # Qemu
+%bcond_without polkit # PolicyKit support
+%bcond_without qemu # Qemu support
%bcond_without sanlock # sanlock storage lock manager
+%bcond_without systemtap # systemtap/dtrace probes
%bcond_without uml # UML support
%bcond_without vbox # VirtualBox support
%bcond_without vmware # VMware Workstation/Player support
-%bcond_with xenapi # XenAPI support
-%bcond_without xen_proxy # Xen proxy
-%bcond_without xen # xen
+%bcond_with vserver # Support for Linux-VServer guests
+%bcond_without xenapi # Xen API (Citrix XenServer) support
+%bcond_without xen # Xen support
+%bcond_without static_libs # static libraries build
# qemu available only on x86 and ppc
%ifnarch %{ix86} %{x8664} ppc
%ifnarch %{ix86} %{x8664} ia64
%undefine with_xen
%endif
-%if %{without xen}
-%undefine with_xen_proxy
-%endif
-
-#define pre rc2
Summary: Toolkit to interact with virtualization capabilities
Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji
Name: libvirt
-Version: 0.9.11
-Release: 0.1
+Version: 1.2.1
+Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5: 6e9fab115075a8fd21d9bd0d7e558a52
+# Source0-md5: cce374220f67895afb6331bd2ddedbfd
Source1: %{name}.init
Source2: %{name}.tmpfiles
Patch0: %{name}-sasl.patch
Patch1: %{name}-lxc.patch
Patch2: %{name}-qemu-acl.patch
Patch3: %{name}-xend.patch
-Patch4: lxc-without-selinux.patch
-Patch5: %{name}-driver-modules.patch
+Patch4: virtlockd.init.patch
+Patch5: %{name}-udevadm-settle.patch
+Patch6: vserver.patch
URL: http://www.libvirt.org/
BuildRequires: audit-libs-devel
BuildRequires: augeas-devel
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: avahi-devel >= 0.6.0
+%{?with_ceph:BuildRequires: ceph-devel}
BuildRequires: curl-devel >= 7.18.0
BuildRequires: cyrus-sasl-devel
+BuildRequires: dbus-devel >= 1.0.0
BuildRequires: device-mapper-devel >= 1.0.0
BuildRequires: gawk
BuildRequires: gettext-devel >= 0.17
+%{?with_glusterfs:BuildRequires: glusterfs-devel >= 3.4.1}
BuildRequires: gnutls-devel >= 1.0.25
BuildRequires: libapparmor-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcap-ng-devel >= 0.4.0
+BuildRequires: libfuse-devel >= 2.8.6
BuildRequires: libgcrypt-devel
-BuildRequires: libnl1-devel >= 1.1
+BuildRequires: libnl-devel >= 3.2
BuildRequires: libpcap-devel >= 1.0.0
BuildRequires: libselinux-devel >= 2.0.82
-BuildRequires: libssh2-devel >= 1.0
+BuildRequires: libssh2-devel >= 1.3
BuildRequires: libstdc++-devel
BuildRequires: libtool
+%{?with_xenapi:BuildRequires: libxenserver-devel}
BuildRequires: libxml2-devel >= 1:2.6.0
BuildRequires: libxslt-devel
BuildRequires: ncurses-devel
-%{?with_netcf:BuildRequires: netcf-devel >= 0.1.4}
+%{?with_netcf:BuildRequires: netcf-devel >= 0.2.0}
BuildRequires: numactl-devel
BuildRequires: openldap-devel
BuildRequires: openwsman-devel >= 2.2.3
BuildRequires: parted-devel >= 1.8.0
BuildRequires: perl-tools-pod
-%{?with_polkit:BuildRequires: polkit >= 0.90}
+%{?with_polkit:BuildRequires: polkit-devel >= 0.90}
BuildRequires: pkgconfig
-BuildRequires: python
-BuildRequires: python-devel
BuildRequires: readline-devel
-BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.627
%{?with_sanlock:BuildRequires: sanlock-devel >= 0.8}
-BuildRequires: udev-devel >= 145
-%{?with_xen:BuildRequires: xen-devel >= 4.1.2}
+%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
+BuildRequires: udev-devel >= 1:145
+%{?with_xen:BuildRequires: xen-devel >= 4.2}
# 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
-Requires: libnl1 >= 1.1
+Requires: libnl >= 3.2
Requires: libpcap >= 1.0.0
Requires: libselinux >= 2.0.82
-Requires: libssh2 >= 1.0
+Requires: libssh2 >= 1.3
Requires: libxml2 >= 1:2.6.0
Requires: openwsman-libs >= 2.2.3
+Obsoletes: libvirt-daemon-esx
+Obsoletes: libvirt-daemon-hyperv
+Obsoletes: libvirt-daemon-openvz
+Obsoletes: libvirt-daemon-phyp
+Obsoletes: libvirt-daemon-vbox
+Obsoletes: libvirt-daemon-vmware
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
initially for the Xen paravirtualization but should be able to
integrate other virtualization mechanisms if needed.
+This package contains the base libraries and configuration file.
+
%description -l pl.UTF-8
Libvirt to zestaw narzędzi w C do współpracy z funkcjami wirtualizacji
obecnych wersji Linuksa.
dającej się zintegrować w razie potrzeby z innymi mechanizmami
wirtualizacji.
+Ten pakiet zawiera podstawowe biblioteki oraz plik konfiguracyjny.
+
%package devel
Summary: Development files for programs using libvirt
Summary(pl.UTF-8): Pliki programistyczne do programów wykorzystujących libvirt
Requires: %{name} = %{version}-%{release}
Requires: audit-libs-devel
Requires: curl-devel >= 7.18.0
+Requires: dbus-devel >= 1.0.0
Requires: device-mapper-devel >= 1.0.0
Requires: gnutls-devel >= 1.0.25
Requires: libapparmor-devel
Requires: libcap-ng-devel >= 0.4.0
Requires: libgcrypt-devel
-Requires: libnl1-devel >= 1.1
+Requires: libnl-devel >= 3.2
Requires: libpcap-devel >= 1.0.0
Requires: libselinux-devel >= 2.0.82
Requires: libxml2-devel >= 1:2.6.0
Requires: numactl-devel
Requires: openwsman-devel >= 2.2.3
-%{?with_xen:Requires: xen-devel}
+%{?with_xen:Requires: xen-devel >= 4.2}
Requires: yajl-devel
%description devel
Ten pakiet zawiera biblioteki statyczne do tworzenia programów
wykorzystujących bibliotekę libvirt.
-%package -n python-%{name}
-Summary: Python bindings to interact with virtualization capabilities
-Summary(pl.UTF-8): Wiązania Pythona do współpracy z funkcjami wirtualizacji
-Group: Development/Languages/Python
-Requires: %{name} = %{version}-%{release}
-
-%description -n python-%{name}
-Libvirt is a C toolkit to interact with the virtualization
-capabilities of recent versions of Linux.
-
-This package contains the Python bindings for the libvirt library.
-
-%description -n python-%{name} -l pl.UTF-8
-Libvirt to zestaw narzędzi w C do współpracy z funkcjami wirtualizacji
-obecnych wersji Linuksa.
-
-Ten pakiet zawiera wiązania Pythona do biblioteki libvirt.
-
%package lock-sanlock
Summary: Sanlock lock manager plugin for libvirt
Summary(pl.UTF-8): Zarządca blokad sanlock dla biblioteki libvirt
Group: Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-daemon = %{version}-%{release}
%description lock-sanlock
Sanlock lock manager plugin for libvirt.
%package daemon
Summary: Server side daemon and supporting files for libvirt library
+Summary(pl.UTF-8): Demon działający po stronie serwera oraz pliki wspierające dla biblioteki libvirt
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: avahi-libs >= 0.6.0
Requires: iproute2
Requires: libblkid >= 2.17
-Provides: libvirt(hypervisor)
+%{?with_netcf:Requires: netcf >= 0.2.0}
Requires: parted-libs >= 1.8.0
# Needed for probing the power management features of the host.
Requires: pm-utils
Requires: systemd-units >= 37-0.10
-Requires: udev-libs >= 145
+Requires: udev-libs >= 1:145
Requires: util-linux
Requires: virtual(module-tools)
Requires: xorg-lib-libpciaccess >= 0.10.0
+Provides: libvirt(hypervisor)
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Suggests: lvm2
Suggests: numad
Suggests: open-iscsi
-Suggests: parted
+Suggests: parted >= 1.8.0
Suggests: polkit >= 0.93
-Suggests: radvd
+#Suggests: radvd
Suggests: scrub
+#Suggests: sheepdog
%description daemon
Server side daemon required to manage the virtualization capabilities
of recent versions of Linux. Requires a hypervisor specific sub-RPM
for specific drivers.
-%package daemon-esx
-Summary: Server side daemon & driver required to run VMware ESX guests
-Group: Development/Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-esx
-Server side daemon and driver required to manage the virtualization
-capabilities of the VMware ESX emulators
-
-%package daemon-hyperv
-Summary: Server side daemon & driver required to run Microsoft Hyper-V guests
-Group: Development/Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-hyperv
-Server side daemon and driver required to manage the virtualization
-capabilities of the Microsoft Hyper-V emulators
+%description daemon -l pl.UTF-8
+Demon działający po stronie serwera wymagany do zarządzania funkcjami
+wirtualizacji nowych wersji Linuksa. Wymaga podpakietu specyficznego
+dla hipernadzorcy.
%package daemon-libxl
-Summary: Server side daemon & driver required to run XEN guests (xenlight)
-Group: Development/Libraries
+Summary: Server side driver required to run XEN guests (xenlight)
+Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości XEN (xenlight)
+Group: Libraries
Requires: %{name}-daemon = %{version}-%{release}
Requires: /usr/sbin/qcow-create
Requires: xen
Provides: libvirt(hypervisor)
%description daemon-libxl
-Server side daemon and driver required to manage the virtualization
-capabilities of XEN via xenlight interface
+Server side driver required to manage the virtualization capabilities
+of XEN via xenlight interface.
+
+%description daemon-libxl -l pl.UTF-8
+Sterownik wymagany po stronie serwera do zarządzania funkcjami
+wirtualizacji XEN poprzez interfejs xenlight.
%package daemon-lxc
-Summary: Server side daemon & driver required to run LXC guests
-Group: Development/Libraries
+Summary: Server side driver required to run LXC guests
+Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości LXC
+Group: Libraries
Requires: %{name}-daemon = %{version}-%{release}
+Requires: libfuse >= 2.8.6
Provides: libvirt(hypervisor)
%description daemon-lxc
-Server side daemon and driver required to manage the virtualization
-capabilities of LXC
-
-%package daemon-openvz
-Summary: Server side daemon & driver required to run OpenVZ guests
-Group: Development/Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-openvz
-Server side daemon and driver required to manage the virtualization
-capabilities of OpenVZ
+Server side driver required to manage the virtualization capabilities
+of LXC.
-%package daemon-phyp
-Summary: Server side daemon & driver required to run Power Hypervisors guests
-Group: Development/Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-phyp
-Server side daemon and driver required to manage the virtualization
-capabilities of Power Hypervisors
+%description daemon-lxc -l pl.UTF-8
+Sterownik wymagany po stronie serwera do zarządzania funkcjami
+wirtualizacji LXC.
%package daemon-qemu
-Summary: Server side daemon & driver required to run QEMU guests
-Group: Development/Libraries
+Summary: Server side driver required to run QEMU guests
+Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości QEMU
+Group: Libraries
Requires: %{name}-daemon = %{version}-%{release}
Requires: /usr/bin/qemu-img
-Requires: qemu
Requires: bzip2
Requires: gzip
Requires: lzop
+Requires: qemu
Requires: xz
Provides: libvirt(hypervisor)
%description daemon-qemu
-Server side daemon and driver required to manage the virtualization
-capabilities of the QEMU emulators
+Server side driver required to manage the virtualization capabilities
+of the QEMU emulators.
+
+%description daemon-qemu -l pl.UTF-8
+Sterownik wymagany po stronie serwera do zarządzania funkcjami
+wirtualizacji emulatora QEMU.
%package daemon-uml
-Summary: Server side daemon & driver required to run UML guests
-Group: Development/Libraries
+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 daemon and driver required to manage the virtualization
-capabilities of UML
-
-%package daemon-vbox
-Summary: Server side daemon & driver required to run Oracle VirtualBox guests
-Group: Development/Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-vbox
-Server side daemon and driver required to manage the virtualization
-capabilities of Oracle VirtualBox
-
-%package daemon-vmware
-Summary: Server side daemon & driver required to run VMware Workstation guests
-Group: Development/Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
+Server side driver required to manage the virtualization capabilities
+of UML.
-%description daemon-vmware
-Server side daemon and driver required to manage the virtualization
-capabilities of VMware Workstation
+%description daemon-uml -l pl.UTF-8
+Sterownik wymagany po stronie serwera do zarządzania funkcjami
+wirtualizacji UML.
%package daemon-xen
-Summary: Server side daemon & driver required to run XEN guests
-Group: Development/Libraries
+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 daemon and driver required to manage the virtualization
-capabilities of 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 library and utilities of the libvirt library
+Summary: Client side utilities of the libvirt library
+Summary(pl.UTF-8): Narzędzia klienckie do biblioteki libvirt
Group: Applications/System
+Requires: %{name} = %{version}-%{release}
Requires: gettext >= 0.18.1.1-6
Requires: gnutls >= 1.0.25
Requires: netcat-openbsd
Requires(postun): systemd-units
%description client
-Shared libraries and client binaries needed to access to the
-virtualization capabilities of recent versions of Linux (and other
-OSes).
+Client binaries needed to access to the virtualization capabilities of
+recent versions of Linux (and other OSes).
+
+%description client -l pl.UTF-8
+Programy klienckie potrzebne do funkcji wirtualizacji nowych wersji
+Linuksa (oraz innych systemów operacyjnych).
%package utils
-Summary: Tools to interact with virtualization capabilities
-Summary(pl.UTF-8): Narzędzia do współpracy z funkcjami wirtualizacyjnymi
+Summary: Tools to interact with virtualization capabilities (metapackage)
+Summary(pl.UTF-8): Narzędzia do współpracy z funkcjami wirtualizacyjnymi (metapakiet)
Group: Applications/System
Requires: %{name}-client = %{version}-%{release}
Requires: %{name}-daemon = %{version}-%{release}
-Requires: %{name}-daemon-esx = %{version}-%{release}
-Requires: %{name}-daemon-hyperv = %{version}-%{release}
-Requires: %{name}-daemon-libxl = %{version}-%{release}
+%{?with_libxl:Requires: %{name}-daemon-libxl = %{version}-%{release}}
Requires: %{name}-daemon-lxc = %{version}-%{release}
-Requires: %{name}-daemon-openvz = %{version}-%{release}
-Requires: %{name}-daemon-phyp = %{version}-%{release}
Requires: %{name}-daemon-qemu = %{version}-%{release}
Requires: %{name}-daemon-uml = %{version}-%{release}
-Requires: %{name}-daemon-vbox = %{version}-%{release}
-Requires: %{name}-daemon-vmware = %{version}-%{release}
Requires: %{name}-daemon-xen = %{version}-%{release}
%description utils
Libvirt is a C toolkit to interact with the virtualization
capabilities of recent versions of Linux.
-This package contains tools for the libvirt library.
+This is metapackage gathering all tools for the libvirt library.
%description utils -l pl.UTF-8
Libvirt to zestaw narzędzi w C do współpracy z funkcjami wirtualizacji
obecnych wersji Linuksa.
-Ten pakiet zawiera narzędzia do biblioteki libvirt.
+To jest metapakiet zbierający wszystkie narzędzia przeznaczone dla
+biblioteki libvirt.
+
+%package -n systemtap-libvirt
+Summary: systemtap/dtrace probes for libvirt
+Summary(pl.UTF-8): Sondy systemtap/dtrace dla libvirt
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+Requires: systemtap-client
+
+%description -n systemtap-libvirt
+systemtap/dtrace probes for libvirt.
+
+%description -n systemtap-libvirt -l pl.UTF-8
+Sondy systemtap/dtrace dla libvirt.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+# TODO
+#patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-
-# weird translations
-%{__rm} po/{my,eu_ES}.{po,gmo}
-
-mv po/vi_VN.po po/vi.po
-mv po/vi_VN.gmo po/vi.gmo
+%{?with_vserver:%patch6 -p1}
%build
%{__libtoolize}
SCRUB=/usr/bin/scrub \
OVSVSCTL=/usr/bin/ovs-vsctl \
NUMAD=/usr/bin/numad \
+ COLLIE=/usr/sbin/collie \
--disable-silent-rules \
+ %{?with_static_libs:--enable-static} \
--with-html-dir=%{_gtkdocdir} \
--with-html-subdir=%{name} \
- --with-init-script=redhat \
- --with-storage-lvm \
+ --with-init-script=systemd+redhat \
+ --with-packager="PLD-Linux" \
+ --with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
+ --with-qemu-user=qemu \
+ --with-qemu-group=qemu \
+ --with-storage-disk \
--with-storage-fs \
+ --with-storage-gluster%{!?with_glusterfs:=no} \
--with-storage-iscsi \
- --with-storage-scsi \
+ --with-storage-lvm \
--with-storage-mpath \
- --with-storage-disk \
- --with-macvtap \
- --with-virtualport \
- --with-udev \
- --with-libssh2 \
- --with-avahi \
- --with-audit \
- --with-libblkid \
- --with-macvtap \
- --with-virtualport \
- --with-numad \
- --with-numactl \
- --with-sasl \
- --with-yajl \
- --with-selinux \
+ --with-storage-rbd%{!?with_ceph:=no} \
+ --with-storage-scsi \
+ --with-storage-sheepdog \
--with-apparmor \
- --with-qemu-user=qemu \
- --with-qemu-group=qemu \
- --without-hal \
- --with-driver-modules \
- %{__with_without polkit} \
+ --with-audit \
+ --with-avahi \
+ %{__with_without systemtap dtrace} \
%{__with_without esx} \
+ --with-driver-modules \
+ --without-hal \
%{__with_without hyperv} \
+ --with-blkid \
+ --with-ssh2 \
%{__with_without libxl} \
%{__with_without lxc} \
+ --with-macvtap \
%{__with_without netcf} \
+ --with-numactl \
+ --with-numad \
%{__with_without openvz} \
%{__with_without phyp} \
+ %{__with_without polkit} \
%{__with_without qemu} \
%{__with_without sanlock} \
+ --with-sasl \
+ --with-selinux \
+ --with-udev \
%{__with_without uml} \
%{__with_without vbox vbox %{_libdir}/VirtualBox} \
+ --with-virtualport \
%{__with_without vmware} \
%{__with_without xen} \
%{__with_without xenapi} \
- --x-libraries=%{_libdir} \
- --with-init-script=systemd
+ --with-yajl \
+ --x-libraries=%{_libdir}
%{__make} \
AWK=gawk
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
install %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
-
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \
+ %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a}
%if %{with sanlock}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \
+ %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
%endif
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{eu_ES,eu}
+# duplicate of vi, just one less message translated
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/vi_VN
+
%find_lang %{name}
%clean
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog README TODO NEWS
+%dir %{_sysconfdir}/libvirt
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
%attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libvirt.so.0
+%if %{with lxc}
+%attr(755,root,root) %{_libdir}/libvirt-lxc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvirt-lxc.so.0
+%endif
%if %{with qemu}
%attr(755,root,root) %{_libdir}/libvirt-qemu.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libvirt-qemu.so.0
%endif
-%dir %{_libdir}/libvirt
-%if %{with sanlock}
-%files lock-sanlock
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/virt-sanlock-cleanup
-%dir %{_libdir}/libvirt/lock-driver
-%attr(755,root,root) %{_libdir}/libvirt/lock-driver/sanlock.so
-%{_datadir}/augeas/lenses/libvirt_sanlock.aug
-%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
-%dir /var/lib/libvirt/sanlock
-%{_mandir}/man8/virt-sanlock-cleanup.8*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-sanlock.conf
-%endif
+%dir %{_libdir}/libvirt
+%dir %{_datadir}/libvirt
+%{_datadir}/libvirt/libvirtLogo.png
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libvirt.so
-%attr(755,root,root) %{_libdir}/libvirt-qemu.so
+%{?with_lxc:%attr(755,root,root) %{_libdir}/libvirt-lxc.so}
+%{?with_qemu:%attr(755,root,root) %{_libdir}/libvirt-qemu.so}
%{_datadir}/%{name}/api
%{_gtkdocdir}/%{name}
%{_includedir}/%{name}
%files static
%defattr(644,root,root,755)
%{_libdir}/libvirt.a
-%{_libdir}/libvirt-qemu.a
+%{?with_lxc:%{_libdir}/libvirt-lxc.a}
+%{?with_qemu:%{_libdir}/libvirt-qemu.a}
-%files -n python-%{name}
+%if %{with sanlock}
+%files lock-sanlock
%defattr(644,root,root,755)
-%doc %{_docdir}/%{name}-python-%{version}
-%attr(755,root,root) %{py_sitedir}/libvirtmod.so
-%attr(755,root,root) %{py_sitedir}/libvirtmod_qemu.so
-%{py_sitedir}/libvirt.py[co]
-%{py_sitedir}/libvirt_qemu.py[co]
+%attr(755,root,root) %{_sbindir}/virt-sanlock-cleanup
+%attr(755,root,root) %{_libdir}/libvirt_sanlock_helper
+%attr(755,root,root) %{_libdir}/libvirt/lock-driver/sanlock.so
+%{_datadir}/augeas/lenses/libvirt_sanlock.aug
+%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
+%dir /var/lib/libvirt/sanlock
+%{_mandir}/man8/virt-sanlock-cleanup.8*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-sanlock.conf
+%endif
%files daemon
%defattr(644,root,root,755)
%doc docs/*.xml
-%dir %{_sysconfdir}/libvirt
%dir %attr(700,root,root) %{_sysconfdir}/libvirt/nwfilter
%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu
%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks
%dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks/autostart
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-lockd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlockd.conf
%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/default.xml
%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/nwfilter/*.xml
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sasl/libvirt.conf
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirtd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlockd
%attr(754,root,root) /etc/rc.d/init.d/libvirtd
+%attr(754,root,root) /etc/rc.d/init.d/virtlockd
%{systemdunitdir}/libvirtd.service
-%config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/libvirtd
+%{systemdunitdir}/virtlockd.service
+%{systemdunitdir}/virtlockd.socket
+%config(noreplace) %verify(not md5 mtime size) /usr/lib/sysctl.d/libvirtd.conf
%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd
%attr(755,root,root) %{_libdir}/libvirt_iohelper
%attr(755,root,root) %{_libdir}/libvirt_parthelper
%attr(755,root,root) %{_libdir}/virt-aa-helper
%attr(755,root,root) %{_sbindir}/libvirtd
+%attr(755,root,root) %{_sbindir}/virtlockd
%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/libvirt_lockd.aug
+%{_datadir}/augeas/lenses/virtlockd.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
-%{?with_polkit:%{_datadir}/polkit-1/actions/org.libvirt.unix.policy}
+%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlockd.aug
+%if %{with polkit}
+%{_datadir}/polkit-1/actions/org.libvirt.api.policy
+%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
+%endif
%{_mandir}/man8/libvirtd.8*
+%{_mandir}/man8/virtlockd.8*
%dir /var/lib/libvirt
%dir /var/lib/libvirt/dnsmasq
%attr(711,root,root) %dir /var/lib/libvirt/boot
%dir /var/run/libvirt/network
%{systemdtmpfilesdir}/%{name}.conf
%dir %{_libdir}/libvirt/connection-driver
-%{?with_netcf:%{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so}
-%{_libdir}/libvirt/connection-driver/libvirt_driver_network.so
-%{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so
-%{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
-%{_libdir}/libvirt/connection-driver/libvirt_driver_remote.so
-%{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
-%{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
-%{_libdir}/libvirt/connection-driver/libvirt_driver_test.so
-
-%if %{with_esx}
-%files daemon-esx
-%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_esx.so
-%endif
-
-%if %{with_hyperv}
-%files daemon-hyperv
-%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_hyperv.so
-%endif
+%{_datadir}/libvirt/cpu_map.xml
+%{?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
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
+%dir %{_libdir}/libvirt/lock-driver
+%attr(755,root,root) %{_libdir}/libvirt/lock-driver/lockd.so
-%if %{with_libxl}
+%if %{with libxl}
%files daemon-libxl
%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
%attr(700,root,root) %dir /var/lib/libvirt/libxl
%attr(700,root,root) %dir /var/run/libvirt/libxl
%attr(700,root,root) %dir /var/log/libvirt/libxl
%endif
-%if %{with_lxc}
+%if %{with lxc}
%files daemon-lxc
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/lxc.conf
%{_datadir}/augeas/lenses/libvirtd_lxc.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
%attr(755,root,root) %{_libdir}/libvirt_lxc
-%{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
-%endif
-
-%if %{with_openvz}
-%files daemon-openvz
-%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_openvz.so
-%endif
-
-%if %{with_phyp}
-%files daemon-phyp
-%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_phyp.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
%endif
%if %{with qemu}
%attr(700,root,root) %dir /var/run/libvirt/qemu
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
%endif
-%if %{with_uml}
+%if %{with uml}
%files daemon-uml
%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_uml.so
+%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
-%if %{with_vbox}
-%files daemon-vbox
-%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
-%endif
-
-%if %{with_vmware}
-%files daemon-vmware
-%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_vmware.so
-%endif
-
-%if %{with_xen}
+%if %{with xen}
%files daemon-xen
%defattr(644,root,root,755)
-%{_libdir}/libvirt/connection-driver/libvirt_driver_xen.so
+%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_xen.so
%endif
%files client
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests
%attr(754,root,root) /etc/rc.d/init.d/libvirt-guests
%{systemdunitdir}/libvirt-guests.service
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virt-login-shell.conf
%attr(755,root,root) %{_bindir}/virsh
%attr(755,root,root) %{_bindir}/virt-host-validate
+%attr(4755,root,root) %{_bindir}/virt-login-shell
%attr(755,root,root) %{_bindir}/virt-xml-validate
%attr(755,root,root) %{_bindir}/virt-pki-validate
+%attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
%{_mandir}/man1/virsh.1*
%{_mandir}/man1/virt-host-validate.1*
+%{_mandir}/man1/virt-login-shell.1*
%{_mandir}/man1/virt-xml-validate.1*
%{_mandir}/man1/virt-pki-validate.1*
-%dir %{_datadir}/libvirt
-%{_datadir}/libvirt/cpu_map.xml
%dir %{_datadir}/libvirt/schemas
%{_datadir}/libvirt/schemas/basictypes.rng
%{_datadir}/libvirt/schemas/capability.rng
%{_datadir}/libvirt/schemas/nwfilter.rng
%{_datadir}/libvirt/schemas/secret.rng
%{_datadir}/libvirt/schemas/storageencryption.rng
+%{_datadir}/libvirt/schemas/storagefilefeatures.rng
%{_datadir}/libvirt/schemas/storagepool.rng
%{_datadir}/libvirt/schemas/storagevol.rng
%files utils
%defattr(644,root,root,755)
+
+%if %{with systemtap}
+%files -n systemtap-libvirt
+%defattr(644,root,root,755)
+%{_datadir}/systemtap/tapset/libvirt_functions.stp
+%{_datadir}/systemtap/tapset/libvirt_probes.stp
+%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp
+%endif
projects / packages / libvirt.git / blobdiff