rpms/libvirt/F-9 libvirt.spec, 1.89, 1.90 sources, 1.31, 1.32 libvirt-0.4.4-boot-cdrom.patch, 1.1, NONE
Daniel Veillard
veillard at fedoraproject.org
Tue Sep 9 14:32:45 UTC 2008
- Previous message (by thread): rpms/rhm/devel .cvsignore, 1.5, 1.6 rhm.spec, 1.24, 1.25 sources, 1.10, 1.11
- Next message (by thread): devel/octave .cvsignore, 1.21, 1.22 octave.spec, 1.74, 1.75 sources, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: veillard
Update of /cvs/pkgs/rpms/libvirt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15293
Modified Files:
libvirt.spec sources
Removed Files:
libvirt-0.4.4-boot-cdrom.patch
Log Message:
Upstream release of 0.4.5, Daniel
Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- libvirt.spec 8 Jul 2008 13:12:51 -0000 1.89
+++ libvirt.spec 9 Sep 2008 14:32:15 -0000 1.90
@@ -1,32 +1,40 @@
# -*- rpm-spec -*-
-%if 0%{fedora} >= 8
-%define with_polkit 1
-%define with_proxy no
-%else
-%define with_polkit 0
-%define with_proxy yes
+%define with_xen 1
+%define with_xen_proxy 1
+%define with_qemu 1
+%define with_openvz 1
+%define with_lxc 1
+%define with_polkit 0
+
+# Xen is available only on i386 x86_64 ia64
+%ifnarch i386 i686 x86_64 ia64
+%define with_xen 0
+%endif
+
+%if ! %{with_xen}
+%define with_xen_proxy 0
%endif
%if "%{fedora}"
%ifarch ppc64
%define with_qemu 0
-%else
-%define with_qemu 1
%endif
-%else
-%define with_qemu 0
+%endif
+
+%if 0%{fedora} >= 8
+%define with_polkit 1
+%define with_xen_proxy 0
%endif
Summary: Library providing a simple API virtualization
Name: libvirt
-Version: 0.4.4
-Release: 2%{?dist}%{?extra_release}
-License: LGPL
+Version: 0.4.5
+Release: 1%{?dist}%{?extra_release}
+License: LGPLv2+
Group: Development/Libraries
Source: libvirt-%{version}.tar.gz
-Patch1: %{name}-%{version}-boot-cdrom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://libvirt.org/
BuildRequires: python python-devel
Requires: libxml2
@@ -47,12 +55,14 @@
%endif
# For mount/umount in FS driver
BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, try to build anyway
-%ifnarch ppc64
+# For showmount in FS driver (netfs discovery)
+BuildRequires: nfs-utils
+Requires: nfs-utils
%if %{with_qemu}
# From QEMU RPMs
Requires: /usr/bin/qemu-img
%else
+%if %{with_xen}
# From Xen RPMs
Requires: /usr/sbin/qcow-create
%endif
@@ -63,10 +73,11 @@
Requires: iscsi-initiator-utils
# For disk driver
Requires: parted
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
BuildRequires: xen-devel
%endif
BuildRequires: libxml2-devel
+BuildRequires: xhtml1-dtds
BuildRequires: readline-devel
BuildRequires: ncurses-devel
BuildRequires: gettext
@@ -84,12 +95,11 @@
%endif
# For mount/umount in FS driver
BuildRequires: util-linux
-# PPC64 has no Xen nor QEmu, try to build anyway
-%ifnarch ppc64
%if %{with_qemu}
# From QEMU RPMs
BuildRequires: /usr/bin/qemu-img
%else
+%if %{with_xen}
# From Xen RPMs
BuildRequires: /usr/sbin/qcow-create
%endif
@@ -114,7 +124,7 @@
Group: Development/Libraries
Requires: libvirt = %{version}
Requires: pkgconfig
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
Requires: xen-devel
%endif
Obsoletes: libvir-devel
@@ -137,31 +147,32 @@
%prep
%setup -q
-%patch1 -p1
%build
-# Xen is available only on i386 x86_64 ia64
-%ifarch i386 i686 x86_64 ia64
-%configure --with-init-script=redhat \
- --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
- --with-remote-file=%{_localstatedir}/run/libvirtd.pid \
- --with-xen-proxy=%{with_proxy}
-%else
-%ifnarch ppc64
-%configure --without-xen \
- --with-init-script=redhat \
- --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
- --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-%else
-%configure --without-xen \
- --without-qemu \
- --with-init-script=redhat \
- --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
- --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+%if ! %{with_xen}
+%define _without_xen --without-xen
+%endif
+
+%if ! %{with_qemu}
+%define _without_qemu --without-qemu
%endif
+
+%if ! %{with_openvz}
+%define _without_openvz --without-openvz
+%endif
+
+%if ! %{with_lxc}
+%define _without_lxc --without-lxc
%endif
-make
+%configure %{?_without_xen} \
+ %{?_without_qemu} \
+ %{?_without_openvz} \
+ %{?_without_lxc} \
+ --with-init-script=redhat \
+ --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+ --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+make %{?_smp_mflags}
%install
rm -fr %{buildroot}
@@ -244,14 +255,21 @@
%dir %{_localstatedir}/lib/libvirt/
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
%if %{with_polkit}
-%{_datadir}/PolicyKit/policy/libvirtd.policy
+%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
%endif
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%if %{with_proxy} == "yes"
+%if %{with_xen_proxy}
%attr(4755, root, root) %{_libexecdir}/libvirt_proxy
%endif
%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
+%if %{with_lxc}
+%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
+%endif
%attr(0755, root, root) %{_sbindir}/libvirtd
%doc docs/*.rng
%doc docs/*.xml
@@ -284,6 +302,12 @@
%doc docs/examples/python
%changelog
+* Mon Sep 8 2008 Daniel Veillard <veillard at redhat.com> - 0.4.5-1.fc10
+- upstream release 0.4.5
+- a lot of bug fixes
+- major updates to QEmu/KVM and Linux containers drivers
+- support for OpenVZ if installed
+
* Tue Jul 8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.4-2.fc9
- Fix booting of CDROM images with KVM (rhbz #452355)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 25 Jun 2008 09:10:04 -0000 1.31
+++ sources 9 Sep 2008 14:32:15 -0000 1.32
@@ -1 +1 @@
-9407900dc16e0ba9ea3eec3cf0a56674 libvirt-0.4.4.tar.gz
+dcb590a6202c332907eae7b44e47ca4b libvirt-0.4.5.tar.gz
--- libvirt-0.4.4-boot-cdrom.patch DELETED ---
- Previous message (by thread): rpms/rhm/devel .cvsignore, 1.5, 1.6 rhm.spec, 1.24, 1.25 sources, 1.10, 1.11
- Next message (by thread): devel/octave .cvsignore, 1.21, 1.22 octave.spec, 1.74, 1.75 sources, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list