rpms/libvirt/F-8 python_make.patch, NONE, 1.1 libvirt.spec, 1.81, 1.82 sources, 1.31, 1.32
Daniel Veillard
veillard at fedoraproject.org
Tue Sep 30 13:11:14 UTC 2008
Author: veillard
Update of /cvs/pkgs/rpms/libvirt/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21337
Modified Files:
libvirt.spec sources
Added Files:
python_make.patch
Log Message:
- update to latest upstream release
daniel
python_make.patch:
--- NEW FILE python_make.patch ---
Index: python/Makefile.am
===================================================================
RCS file: /data/cvs/libxen/python/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- python/Makefile.am 5 Feb 2008 19:27:37 -0000 1.13
+++ python/Makefile.am 24 Sep 2008 13:21:06 -0000
@@ -50,7 +50,7 @@ GENERATED= libvirt-export.c \
$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
-libvirt.py: $(srcdir)/libvir.py libvirtclass.py
+libvirt.py: $(srcdir)/libvir.py $(GENERATED)
cat $(srcdir)/libvir.py libvirtclass.py > $@-t
mv $@-t $@
*** python/Makefile.in.orig 2008-09-24 15:19:20.000000000 +0200
--- python/Makefile.in 2008-09-24 15:20:07.000000000 +0200
*************** uninstall-am: uninstall-local uninstall-
*** 1027,1033 ****
@WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
@WITH_PYTHON_TRUE@ $(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
! @WITH_PYTHON_TRUE at libvirt.py: $(srcdir)/libvir.py libvirtclass.py
@WITH_PYTHON_TRUE@ cat $(srcdir)/libvir.py libvirtclass.py > $@-t
@WITH_PYTHON_TRUE@ mv $@-t $@
--- 1027,1033 ----
@WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
@WITH_PYTHON_TRUE@ $(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
! @WITH_PYTHON_TRUE at libvirt.py: $(srcdir)/libvir.py $(GENERATED)
@WITH_PYTHON_TRUE@ cat $(srcdir)/libvir.py libvirtclass.py > $@-t
@WITH_PYTHON_TRUE@ mv $@-t $@
Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-8/libvirt.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libvirt.spec 8 Jul 2008 13:30:54 -0000 1.81
+++ libvirt.spec 30 Sep 2008 13:10:43 -0000 1.82
@@ -1,32 +1,41 @@
# -*- rpm-spec -*-
-%if "%{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.6
+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
+Patch0: python_make.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://libvirt.org/
BuildRequires: python python-devel
Requires: libxml2
@@ -47,12 +56,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 +74,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 +96,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 +125,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 +148,33 @@
%prep
%setup -q
-%patch1 -p1
+%patch0 -p0
%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
-make
+%if ! %{with_openvz}
+%define _without_openvz --without-openvz
+%endif
+
+%if ! %{with_lxc}
+%define _without_lxc --without-lxc
+%endif
+
+%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}
@@ -176,6 +189,8 @@
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
# Default dir for disk images defined in SELinux policy
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
+# Default dir for kernel+initrd images defnied in SELinux policy
+install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
# We don't want to install /etc/libvirt/qemu/networks in the main %files list
# because if the admin wants to delete the default network completely, we don't
@@ -241,14 +256,22 @@
%dir %{_localstatedir}/run/libvirt/
%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
@@ -281,6 +304,9 @@
%doc docs/examples/python
%changelog
+* Tue Sep 30 2008 Daniel Veillard <veillard at redhat.com> - 0.4.6-1.f8
+- update to latest upstream release
+
* Tue Jul 8 2008 Daniel P. Berrange <berrange at redhat.com> - 0.4.4-2.fc8
- Fix booting of CDROM images with KVM (rhbz #452355)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-8/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 25 Jun 2008 09:29:06 -0000 1.31
+++ sources 30 Sep 2008 13:10:43 -0000 1.32
@@ -1 +1 @@
-9407900dc16e0ba9ea3eec3cf0a56674 libvirt-0.4.4.tar.gz
+abdf727deaffd868172f7243eb75ffe3 libvirt-0.4.6.tar.gz
More information about the fedora-extras-commits
mailing list