Update to upstream 1.0.1 release
This commit is contained in:
Daniel Veillard
parent
8cc50838dc
commit
f5ff4a2393
100
libvirt.spec
100
libvirt.spec
|
|
@ -53,7 +53,13 @@
|
|||
|
||||
%define with_qemu_tcg %{with_qemu}
|
||||
# Change if we ever provide qemu-kvm binaries on non-x86 hosts
|
||||
%ifarch %{ix86} x86_64
|
||||
%if 0%{?fedora} >= 18
|
||||
%define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x
|
||||
%else
|
||||
%define qemu_kvm_arches %{ix86} x86_64
|
||||
%endif
|
||||
|
||||
%ifarch %{qemu_kvm_arches}
|
||||
%define with_qemu_kvm %{with_qemu}
|
||||
%else
|
||||
%define with_qemu_kvm 0
|
||||
|
|
@ -93,6 +99,7 @@
|
|||
# A few optional bits off by default, we enable later
|
||||
%define with_polkit 0%{!?_without_polkit:0}
|
||||
%define with_capng 0%{!?_without_capng:0}
|
||||
%define with_fuse 0%{!?_without_fuse:0}
|
||||
%define with_netcf 0%{!?_without_netcf:0}
|
||||
%define with_udev 0%{!?_without_udev:0}
|
||||
%define with_hal 0%{!?_without_hal:0}
|
||||
|
|
@ -182,8 +189,8 @@
|
|||
%endif
|
||||
%endif
|
||||
|
||||
# Fedora doesn't have new enough Xen for libxl until F16
|
||||
%if 0%{?fedora} && 0%{?fedora} < 16
|
||||
# Fedora doesn't have new enough Xen for libxl until F18
|
||||
%if 0%{?fedora} && 0%{?fedora} < 18
|
||||
%define with_libxl 0
|
||||
%endif
|
||||
|
||||
|
|
@ -197,6 +204,11 @@
|
|||
%define with_capng 0%{!?_without_capng:1}
|
||||
%endif
|
||||
|
||||
# fuse is used to provide virtualized /proc for LXC
|
||||
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
|
||||
%define with_fuse 0%{!?_without_fuse:1}
|
||||
%endif
|
||||
|
||||
# netcf is used to manage network interfaces in Fedora 12 / RHEL-6 or newer
|
||||
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
||||
%define with_netcf 0%{!?_without_netcf:%{server_drivers}}
|
||||
|
|
@ -300,10 +312,6 @@
|
|||
%define with_storage 0
|
||||
%endif
|
||||
|
||||
# libxl driver doesn't build with Xen 4.2 in rawhide
|
||||
%if 0%{?fedora} && 0%{?fedora} >= 18
|
||||
%define with_libxl 0
|
||||
%endif
|
||||
|
||||
# Force QEMU to run as non-root
|
||||
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
||||
|
|
@ -323,9 +331,16 @@
|
|||
%define with_rhel5 0
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
%define with_systemd_macros 1
|
||||
%else
|
||||
%define with_systemd_macros 0
|
||||
%endif
|
||||
|
||||
|
||||
Summary: Library providing a simple virtualization API
|
||||
Name: libvirt
|
||||
Version: 1.0.0
|
||||
Version: 1.0.1
|
||||
Release: 1%{?dist}%{?extra_release}
|
||||
License: LGPLv2+
|
||||
Group: Development/Libraries
|
||||
|
|
@ -507,6 +522,9 @@ BuildRequires: numactl-devel
|
|||
%if %{with_capng}
|
||||
BuildRequires: libcap-ng-devel >= 0.5.0
|
||||
%endif
|
||||
%if %{with_fuse}
|
||||
BuildRequires: fuse-devel >= 2.8.6
|
||||
%endif
|
||||
%if %{with_phyp} || %{with_libssh2_transport}
|
||||
%if %{with_libssh2_transport}
|
||||
BuildRequires: libssh2-devel >= 1.3.0
|
||||
|
|
@ -694,11 +712,8 @@ Requires(postun): systemd-units
|
|||
%if %{with_numad}
|
||||
Requires: numad
|
||||
%endif
|
||||
|
||||
# libxl driver doesn't build with Xen 4.2 in rawhide
|
||||
%if ! %{with_libxl}
|
||||
Obsoletes: libvirt-daemon-driver-libxl
|
||||
%endif
|
||||
# libvirtd depends on 'messagebus' service
|
||||
Requires: dbus
|
||||
|
||||
%description daemon
|
||||
Server side daemon required to manage the virtualization capabilities
|
||||
|
|
@ -1195,6 +1210,10 @@ of recent versions of Linux (and other OSes).
|
|||
%define _without_capng --without-capng
|
||||
%endif
|
||||
|
||||
%if ! %{with_fuse}
|
||||
%define _without_fuse --without-fuse
|
||||
%endif
|
||||
|
||||
%if ! %{with_netcf}
|
||||
%define _without_netcf --without-netcf
|
||||
%endif
|
||||
|
|
@ -1298,6 +1317,7 @@ autoreconf -if
|
|||
%{?_without_numactl} \
|
||||
%{?_without_numad} \
|
||||
%{?_without_capng} \
|
||||
%{?_without_fuse} \
|
||||
%{?_without_netcf} \
|
||||
%{?_without_selinux} \
|
||||
%{?_with_selinux_mount} \
|
||||
|
|
@ -1389,8 +1409,6 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
|
|||
mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \
|
||||
$RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version}
|
||||
|
||||
sed -i -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests
|
||||
|
||||
%if %{with_dtrace}
|
||||
%ifarch %{power64} s390x x86_64 ia64 alpha sparc64
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
|
||||
|
|
@ -1474,11 +1492,15 @@ done
|
|||
%endif
|
||||
|
||||
%if %{with_systemd}
|
||||
%if %{with_systemd_macros}
|
||||
%systemd_post libvirtd.service
|
||||
%else
|
||||
if [ $1 -eq 1 ] ; then
|
||||
# Initial installation
|
||||
/bin/systemctl enable virtlockd.socket >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable libvirtd.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable cgconfig.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%else
|
||||
%if %{with_cgconfig}
|
||||
# Starting with Fedora 16/RHEL-7, systemd automounts all cgroups,
|
||||
|
|
@ -1498,11 +1520,17 @@ fi
|
|||
|
||||
%preun daemon
|
||||
%if %{with_systemd}
|
||||
%if %{with_systemd_macros}
|
||||
%systemd_preun libvirtd.service
|
||||
%else
|
||||
if [ $1 -eq 0 ] ; then
|
||||
# Package removal, not upgrade
|
||||
/bin/systemctl --no-reload disable virtlockd.socket > /dev/null 2>&1 || :
|
||||
/bin/systemctl --no-reload disable libvirtd.service > /dev/null 2>&1 || :
|
||||
/bin/systemctl stop libvirtd.service > /dev/null 2>&1 || :
|
||||
/bin/systemctl stop virtlockd.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%else
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/service libvirtd stop 1>/dev/null 2>&1
|
||||
|
|
@ -1512,12 +1540,20 @@ fi
|
|||
|
||||
%postun daemon
|
||||
%if %{with_systemd}
|
||||
%if %{with_systemd_macros}
|
||||
%systemd_postun_with_restart libvirtd.service
|
||||
%else
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
# Package upgrade, not uninstall
|
||||
/bin/systemctl status virtlockd.service >/dev/null 2>&1
|
||||
if [ $? = 1 ] ; then
|
||||
/bin/systemctl kill --signal=USR1 virtlockd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_network}
|
||||
%post daemon-config-network
|
||||
|
|
@ -1548,6 +1584,9 @@ fi
|
|||
%preun client
|
||||
|
||||
%if %{with_systemd}
|
||||
%if %{with_systemd_macros}
|
||||
%systemd_preun libvirt-guests.service
|
||||
%endif
|
||||
%else
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/chkconfig --del libvirt-guests
|
||||
|
|
@ -1559,6 +1598,9 @@ fi
|
|||
|
||||
/sbin/ldconfig
|
||||
%if %{with_systemd}
|
||||
%if %{with_systemd_macros}
|
||||
%systemd_post libvirt-guests.service
|
||||
%endif
|
||||
%else
|
||||
/sbin/chkconfig --add libvirt-guests
|
||||
%endif
|
||||
|
|
@ -1566,6 +1608,9 @@ fi
|
|||
%postun client -p /sbin/ldconfig
|
||||
|
||||
%if %{with_systemd}
|
||||
%if %{with_systemd_macros}
|
||||
%systemd_postun_with_restart libvirt-guests.service
|
||||
%endif
|
||||
%triggerun client -- libvirt < 0.9.4
|
||||
%{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||:
|
||||
|
||||
|
|
@ -1617,13 +1662,20 @@ fi
|
|||
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
|
||||
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
|
||||
%if %{with_systemd}
|
||||
%{_unitdir}/libvirtd.service
|
||||
%{_unitdir}/libvirt-guests.service
|
||||
%{_unitdir}/virtlockd.service
|
||||
%{_unitdir}/virtlockd.socket
|
||||
%else
|
||||
%{_sysconfdir}/rc.d/init.d/libvirtd
|
||||
%{_sysconfdir}/rc.d/init.d/libvirt-guests
|
||||
%{_sysconfdir}/rc.d/init.d/virtlockd
|
||||
%endif
|
||||
%doc daemon/libvirtd.upstart
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
|
||||
%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6
|
||||
%config(noreplace) %{_sysconfdir}/sysctl.d/libvirtd
|
||||
|
|
@ -1640,6 +1692,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
|
|||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
|
||||
%if %{with_qemu}
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
||||
%endif
|
||||
%if %{with_lxc}
|
||||
|
|
@ -1681,12 +1734,20 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
|
|||
%ghost %dir %{_localstatedir}/run/libvirt/libxl/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
|
||||
%endif
|
||||
%if %{with_xen}
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/
|
||||
%endif
|
||||
%if %{with_network}
|
||||
%ghost %dir %{_localstatedir}/run/libvirt/network/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
|
||||
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
|
||||
%endif
|
||||
|
||||
%if %{with_libvirtd}
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver
|
||||
%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
|
||||
%endif
|
||||
|
||||
%if %{with_qemu}
|
||||
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
||||
|
|
@ -1699,6 +1760,8 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
|
|||
|
||||
%{_datadir}/augeas/lenses/libvirtd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
|
||||
%{_datadir}/augeas/lenses/libvirt_lockd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
|
||||
|
||||
%if %{with_polkit}
|
||||
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
||||
|
|
@ -1720,6 +1783,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
|
|||
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
|
||||
%attr(0755, root, root) %{_sbindir}/libvirtd
|
||||
%attr(0755, root, root) %{_sbindir}/virtlockd
|
||||
|
||||
%{_mandir}/man8/libvirtd.8*
|
||||
|
||||
|
|
@ -1882,7 +1946,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
|
|||
|
||||
%{_datadir}/libvirt/cpu_map.xml
|
||||
|
||||
%{_sysconfdir}/rc.d/init.d/libvirt-guests
|
||||
%if %{with_systemd}
|
||||
%{_unitdir}/libvirt-guests.service
|
||||
%endif
|
||||
|
|
@ -1930,6 +1993,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Dec 17 2012 Daniel Veillard <veillard@redhat.com> - 1.0.1-1
|
||||
- Update to 1.0.1 release
|
||||
|
||||
* Thu Nov 8 2012 Daniel P. Berrange <berrange@redhat.com> - 1.0.0-1
|
||||
- Update to 1.0.0 release
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue