- updated to 2.1.0

[packages/libvirt.git] / libvirt.spec

diff --git a/libvirt.spec b/libvirt.spec
index b9bd489755bdf236344da2ba5d991d5fbfd8f8ed..21dcb6c131f302622c0f53cac965fa5f5589eea8 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,6 +1,5 @@
 # TODO:
 # - wireshark-dissector
-# - seems that lxc patch is not needed anymore, verify that before removing
 # - pldize virtlockd.init
 #
 # Conditional build:
@@ -23,6 +22,7 @@
 %bcond_without xenapi          # Xen API (Citrix XenServer) support
 %bcond_without xen             # Xen support
 %bcond_without static_libs     # static libraries build
+%bcond_without ldap            # don't require openldap-devel
 
 # qemu available only on x86 and ppc
 %ifnarch %{ix86} %{x8664} ppc
@@ -39,20 +39,19 @@
 Summary:       Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):     Narzędzia współpracujące z funkcjami wirtualizacji
 Name:          libvirt
-Version:       1.3.3
+Version:       2.1.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
-Source0:       ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5: 698e0949a41a2b669dbe374759aaa64b
+Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
+# Source0-md5: fd1c054a8b59235e877efb728de79386
 Source1:       %{name}.init
 Patch0:                %{name}-sasl.patch
-Patch2:                %{name}-qemu-acl.patch
-Patch3:                %{name}-xend.patch
-Patch5:                %{name}-udevadm-settle.patch
-Patch7:                bashisms.patch
-Patch8:                %{name}-guests.init.patch
-Patch9:                %{name}-sysctl-dir.patch
+Patch1:                %{name}-qemu-acl.patch
+Patch2:                %{name}-udevadm-settle.patch
+Patch3:                bashisms.patch
+Patch4:                %{name}-guests.init.patch
+Patch5:                %{name}-sysctl-dir.patch
 URL:           http://www.libvirt.org/
 BuildRequires: audit-libs-devel
 BuildRequires: augeas-devel
@@ -84,17 +83,16 @@ BuildRequires:      libxslt-devel
 BuildRequires: ncurses-devel
 %{?with_netcf:BuildRequires:   netcf-devel >= 0.2.0}
 BuildRequires: numactl-devel
-BuildRequires: openldap-devel
+%{?with_ldap:BuildRequires:    openldap-devel}
 %{?with_hyperv:BuildRequires:  openwsman-devel >= 2.2.3}
 BuildRequires: parted-devel >= 1.8.0
 BuildRequires: pkgconfig
-BuildRequires: polkit
+%{?with_polkit:BuildRequires:  polkit}
 %{?with_polkit:BuildRequires:  polkit-devel >= 0.90}
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.627
 %{?with_sanlock:BuildRequires: sanlock-devel >= 0.8}
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
-BuildRequires: sheepdog
 BuildRequires: udev-devel >= 1:145
 %{?with_xen:BuildRequires:     xen-devel >= 4.2}
 # For disk driver
@@ -222,10 +220,9 @@ Requires:  iproute2
 Requires:      libblkid >= 2.17
 %{?with_netcf:Requires:        netcf >= 0.2.0}
 Requires:      parted-libs >= 1.8.0
+Requires:      rc-scripts
 # Needed for probing the power management features of the host.
 Requires:      pm-utils
-Requires:      rc-scripts
-Requires:      sheepdog
 Requires:      udev-libs >= 1:145
 Requires:      util-linux
 Requires:      virtual(module-tools)
@@ -249,6 +246,7 @@ Suggests:   parted >= 1.8.0
 Suggests:      polkit >= 0.93
 #Suggests:     radvd
 Suggests:      scrub
+#Suggests:     sheepdog
 Provides:      libvirt(hypervisor)
 
 %description daemon
@@ -337,7 +335,6 @@ Group:              Libraries
 Requires:      %{name}-daemon = %{version}-%{release}
 Requires:      /usr/sbin/qcow-create
 Requires:      xen
-Requires:      xen-xend
 Provides:      libvirt(hypervisor)
 
 %description daemon-xen
@@ -376,7 +373,7 @@ 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}
-Requires:      %{name}-daemon-uml = %{version}-%{release}
+%{?with_uml:Requires:  %{name}-daemon-uml = %{version}-%{release}}
 Requires:      %{name}-daemon-xen = %{version}-%{release}
 
 %description utils
@@ -408,12 +405,11 @@ Sondy systemtap/dtrace dla libvirt.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 %{__libtoolize}
@@ -454,7 +450,7 @@ Sondy systemtap/dtrace dla libvirt.
        SCRUB=/usr/bin/scrub \
        OVSVSCTL=/usr/bin/ovs-vsctl \
        NUMAD=/usr/bin/numad \
-       COLLIE=/usr/sbin/collie \
+       SHEEPDOGCLI=/usr/sbin/collie \
        --disable-silent-rules \
        %{?with_static_libs:--enable-static} \
        --with-html-dir=%{_gtkdocdir} \
@@ -562,7 +558,7 @@ fi
 %doc ChangeLog README TODO NEWS
 %dir %{_sysconfdir}/libvirt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
-%attr(755,root,root) %{_libdir}/libnss_libvirt.so.2
+%attr(755,root,root) %{_libdir}/libnss_libvirt.so.?
 %attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvirt.so.0
 %attr(755,root,root) %{_libdir}/libvirt-admin.so.*.*.*
@@ -588,6 +584,7 @@ fi
 %{_gtkdocdir}/%{name}
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libvirt.pc
+%{_pkgconfigdir}/libvirt-admin.pc
 %{?with_lxc:%{_pkgconfigdir}/libvirt-lxc.pc}
 %{_pkgconfigdir}/libvirt-qemu.pc
 
@@ -674,7 +671,7 @@ fi
 %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
+%{?with_vbox:%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