diff --git a/fix-pci-attach-xen-driver.patch b/fix-pci-attach-xen-driver.patch
index f2cd6df..bb2c39a 100644
--- a/fix-pci-attach-xen-driver.patch
+++ b/fix-pci-attach-xen-driver.patch
@@ -8,10 +8,10 @@ uses the 'device_configure' RPC.
This patch changes the xend driver to always call 'device_configure' for
PCI devices to be consistent with the usage in the xen tools.
-Index: libvirt-1.1.4/src/xen/xend_internal.c
+Index: libvirt-1.2.0/src/xen/xend_internal.c
===================================================================
---- libvirt-1.1.4.orig/src/xen/xend_internal.c
-+++ libvirt-1.1.4/src/xen/xend_internal.c
+--- libvirt-1.2.0.orig/src/xen/xend_internal.c
++++ libvirt-1.2.0/src/xen/xend_internal.c
@@ -2207,6 +2207,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80];
diff --git a/clone.patch b/ia64-clone.patch
similarity index 51%
rename from clone.patch
rename to ia64-clone.patch
index 4e01402..d846172 100644
--- a/clone.patch
+++ b/ia64-clone.patch
@@ -1,28 +1,18 @@
-Index: src/lxc/lxc_container.c
+Index: libvirt-1.2.0/src/lxc/lxc_container.c
===================================================================
---- src/lxc/lxc_container.c.orig
-+++ src/lxc/lxc_container.c
-@@ -144,6 +144,7 @@ int lxcContainerHasReboot(void)
- int cmd, v;
- int status;
- char *tmp;
-+ int stacksize = getpagesize() * 4;
-
- if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf) < 0)
- return -1;
-@@ -160,12 +161,19 @@ int lxcContainerHasReboot(void)
+--- libvirt-1.2.0.orig/src/lxc/lxc_container.c
++++ libvirt-1.2.0/src/lxc/lxc_container.c
+@@ -162,12 +162,19 @@ int lxcContainerHasReboot(void)
VIR_FREE(buf);
cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF;
-- if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0)
+#ifdef __ia64__
+ stacksize *= 2;
+#endif
-+ if (VIR_ALLOC_N(stack, stacksize) < 0)
+ if (VIR_ALLOC_N(stack, stacksize) < 0)
return -1;
-- childStack = stack + (getpagesize() * 4);
-+ childStack = stack + stacksize;
+ childStack = stack + stacksize;
+#ifdef __ia64__
+ cpid = __clone2(lxcContainerRebootChild, childStack, stacksize, flags, &cmd);
@@ -32,7 +22,17 @@ Index: src/lxc/lxc_container.c
VIR_FREE(stack);
if (cpid < 0) {
virReportSystemError(errno, "%s",
-@@ -2034,7 +2042,11 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -1985,6 +1992,9 @@ int lxcContainerStart(virDomainDefPtr de
+ .handshakefd = handshakefd
+ };
+
++#ifdef __ia64__
++ stacksize *= 2;
++#endif
+ /* allocate a stack for the container */
+ if (VIR_ALLOC_N(stack, stacksize) < 0)
+ return -1;
+@@ -2010,7 +2020,11 @@ int lxcContainerStart(virDomainDefPtr de
cflags |= CLONE_NEWNET;
}
@@ -44,29 +44,17 @@ Index: src/lxc/lxc_container.c
VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid);
-@@ -2060,6 +2072,7 @@ int lxcContainerAvailable(int features)
- int cpid;
- char *childStack;
- char *stack;
-+ int stacksize = getpagesize() * 4;
-
- if (features & LXC_CONTAINER_FEATURE_USER)
- flags |= CLONE_NEWUSER;
-@@ -2067,14 +2080,21 @@ int lxcContainerAvailable(int features)
+@@ -2044,12 +2058,19 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;
-- if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) {
+#ifdef __ia64__
+ stacksize *= 2;
+#endif
-+ if (VIR_ALLOC_N(stack, stacksize) < 0) {
- VIR_DEBUG("Unable to allocate stack");
+ if (VIR_ALLOC_N(stack, stacksize) < 0)
return -1;
- }
-- childStack = stack + (getpagesize() * 4);
-+ childStack = stack + stacksize;
+ childStack = stack + stacksize;
+#ifdef __ia64__
+ cpid = __clone2(lxcContainerDummyChild, childStack, stacksize, flags, NULL);
diff --git a/install-apparmor-profiles.patch b/install-apparmor-profiles.patch
index 0d70823..a63df1f 100644
--- a/install-apparmor-profiles.patch
+++ b/install-apparmor-profiles.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.4/examples/apparmor/Makefile.am
+Index: libvirt-1.2.0/examples/apparmor/Makefile.am
===================================================================
---- libvirt-1.1.4.orig/examples/apparmor/Makefile.am
-+++ libvirt-1.1.4/examples/apparmor/Makefile.am
+--- libvirt-1.2.0.orig/examples/apparmor/Makefile.am
++++ libvirt-1.2.0/examples/apparmor/Makefile.am
@@ -14,8 +14,45 @@
## License along with this library. If not, see
## .
@@ -53,10 +53,10 @@ Index: libvirt-1.1.4/examples/apparmor/Makefile.am
+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
+
+endif
-Index: libvirt-1.1.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-1.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
-+++ libvirt-1.1.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ libvirt-1.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,41 @@
+# Last Modified: Fri Aug 19 11:21:48 2011
+#include
@@ -99,9 +99,9 @@ Index: libvirt-1.1.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+ /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r,
+}
-Index: libvirt-1.1.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-1.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
---- libvirt-1.1.4.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-1.2.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,38 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@@ -142,9 +142,9 @@ Index: libvirt-1.1.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper
- /var/lib/libvirt/images/ r,
- /var/lib/libvirt/images/** r,
-}
-Index: libvirt-1.1.4/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-1.2.0/examples/apparmor/usr.sbin.libvirtd
===================================================================
---- libvirt-1.1.4.orig/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-1.2.0.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
@@ -199,10 +199,10 @@ Index: libvirt-1.1.4/examples/apparmor/usr.sbin.libvirtd
- change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
-
-}
-Index: libvirt-1.1.4/examples/apparmor/usr.sbin.libvirtd.in
+Index: libvirt-1.2.0/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
-+++ libvirt-1.1.4/examples/apparmor/usr.sbin.libvirtd.in
++++ libvirt-1.2.0/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,61 @@
+# Last Modified: Fri Aug 19 11:20:36 2011
+#include
@@ -265,9 +265,9 @@ Index: libvirt-1.1.4/examples/apparmor/usr.sbin.libvirtd.in
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
-Index: libvirt-1.1.4/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.0/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-1.1.4.orig/examples/apparmor/libvirt-qemu
+--- libvirt-1.2.0.orig/examples/apparmor/libvirt-qemu
+++ /dev/null
@@ -1,129 +0,0 @@
-# Last Modified: Fri Mar 9 14:43:22 2012
@@ -399,10 +399,10 @@ Index: libvirt-1.1.4/examples/apparmor/libvirt-qemu
-
- /usr/libexec/qemu-bridge-helper rmix,
- }
-Index: libvirt-1.1.4/examples/apparmor/libvirt-qemu.in
+Index: libvirt-1.2.0/examples/apparmor/libvirt-qemu.in
===================================================================
--- /dev/null
-+++ libvirt-1.1.4/examples/apparmor/libvirt-qemu.in
++++ libvirt-1.2.0/examples/apparmor/libvirt-qemu.in
@@ -0,0 +1,132 @@
+# Last Modified: Fri Mar 9 14:43:22 2012
+
diff --git a/libvirt-1.1.4.tar.bz2 b/libvirt-1.1.4.tar.bz2
deleted file mode 100644
index dd63173..0000000
--- a/libvirt-1.1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:407a9b7602e86bcec457d95dcf97ff806544850b05b9bab9854dcce76e10c1ae
-size 19319071
diff --git a/libvirt-1.2.0.tar.bz2 b/libvirt-1.2.0.tar.bz2
new file mode 100644
index 0000000..7bcf571
--- /dev/null
+++ b/libvirt-1.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbfe494beed93925f3f74ecc51775299218127ce9b6f747852701afa120b7eda
+size 19390046
diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch
index 5f81453..c64b46a 100644
--- a/libvirt-guests-init-script.patch
+++ b/libvirt-guests-init-script.patch
@@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
-Index: libvirt-1.1.4/tools/libvirt-guests.init.in
+Index: libvirt-1.2.0/tools/libvirt-guests.init.in
===================================================================
---- libvirt-1.1.4.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.1.4/tools/libvirt-guests.init.in
+--- libvirt-1.2.0.orig/tools/libvirt-guests.init.in
++++ libvirt-1.2.0/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@
# the following is the LSB init header
#
@@ -28,10 +28,10 @@ Index: libvirt-1.1.4/tools/libvirt-guests.init.in
### END INIT INFO
# the following is chkconfig init header
-Index: libvirt-1.1.4/tools/libvirt-guests.sh.in
+Index: libvirt-1.2.0/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-1.1.4.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.1.4/tools/libvirt-guests.sh.in
+--- libvirt-1.2.0.orig/tools/libvirt-guests.sh.in
++++ libvirt-1.2.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
# License along with this library. If not, see
# .
@@ -189,10 +189,10 @@ Index: libvirt-1.1.4/tools/libvirt-guests.sh.in
esac
-exit $RETVAL
+rc_exit
-Index: libvirt-1.1.4/tools/libvirt-guests.sysconf
+Index: libvirt-1.2.0/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-1.1.4.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.1.4/tools/libvirt-guests.sysconf
+--- libvirt-1.2.0.orig/tools/libvirt-guests.sysconf
++++ libvirt-1.2.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch
index 9998960..855c830 100644
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@@ -1,16 +1,16 @@
-Index: libvirt-1.1.4/configure.ac
+Index: libvirt-1.2.0/configure.ac
===================================================================
---- libvirt-1.1.4.orig/configure.ac
-+++ libvirt-1.1.4/configure.ac
-@@ -230,6 +230,7 @@ LIBVIRT_CHECK_DBUS
- LIBVIRT_CHECK_FUSE
+--- libvirt-1.2.0.orig/configure.ac
++++ libvirt-1.2.0/configure.ac
+@@ -231,6 +231,7 @@ LIBVIRT_CHECK_FUSE
+ LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL
LIBVIRT_CHECK_NETCF
+LIBVIRT_CHECK_NETCONTROL
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS
-@@ -2375,11 +2376,12 @@ if test "$with_libvirtd" = "no" ; then
+@@ -2312,11 +2313,12 @@ if test "$with_libvirtd" = "no" ; then
with_interface=no
fi
@@ -26,19 +26,19 @@ Index: libvirt-1.1.4/configure.ac
esac
if test "$with_interface" = "yes" ; then
-@@ -2694,6 +2696,7 @@ LIBVIRT_RESULT_DBUS
- LIBVIRT_RESULT_FUSE
+@@ -2631,6 +2633,7 @@ LIBVIRT_RESULT_FUSE
+ LIBVIRT_RESULT_GLUSTER
LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF
+LIBVIRT_RESULT_NETCONTROL
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
-Index: libvirt-1.1.4/src/Makefile.am
+Index: libvirt-1.2.0/src/Makefile.am
===================================================================
---- libvirt-1.1.4.orig/src/Makefile.am
-+++ libvirt-1.1.4/src/Makefile.am
-@@ -780,6 +780,10 @@ if WITH_NETCF
+--- libvirt-1.2.0.orig/src/Makefile.am
++++ libvirt-1.2.0/src/Makefile.am
+@@ -781,6 +781,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c
endif WITH_NETCF
@@ -49,7 +49,7 @@ Index: libvirt-1.1.4/src/Makefile.am
if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c
-@@ -1342,10 +1346,15 @@ if WITH_NETCF
+@@ -1346,10 +1350,15 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else ! WITH_NETCF
@@ -65,11 +65,11 @@ Index: libvirt-1.1.4/src/Makefile.am
endif ! WITH_NETCF
if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
-Index: libvirt-1.1.4/tools/virsh.c
+Index: libvirt-1.2.0/tools/virsh.c
===================================================================
---- libvirt-1.1.4.orig/tools/virsh.c
-+++ libvirt-1.1.4/tools/virsh.c
-@@ -3026,6 +3026,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+--- libvirt-1.2.0.orig/tools/virsh.c
++++ libvirt-1.2.0/tools/virsh.c
+@@ -3029,6 +3029,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
@@ -78,10 +78,10 @@ Index: libvirt-1.1.4/tools/virsh.c
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
-Index: libvirt-1.1.4/src/interface/interface_backend_netcf.c
+Index: libvirt-1.2.0/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-1.1.4.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.1.4/src/interface/interface_backend_netcf.c
+--- libvirt-1.2.0.orig/src/interface/interface_backend_netcf.c
++++ libvirt-1.2.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include
@@ -165,10 +165,10 @@ Index: libvirt-1.1.4/src/interface/interface_backend_netcf.c
return 0;
}
-Index: libvirt-1.1.4/src/interface/interface_driver.c
+Index: libvirt-1.2.0/src/interface/interface_driver.c
===================================================================
---- libvirt-1.1.4.orig/src/interface/interface_driver.c
-+++ libvirt-1.1.4/src/interface/interface_driver.c
+--- libvirt-1.2.0.orig/src/interface/interface_driver.c
++++ libvirt-1.2.0/src/interface/interface_driver.c
@@ -28,8 +28,15 @@ interfaceRegister(void) {
if (netcfIfaceRegister() == 0)
return 0;
@@ -186,10 +186,10 @@ Index: libvirt-1.1.4/src/interface/interface_driver.c
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
-Index: libvirt-1.1.4/m4/virt-netcontrol.m4
+Index: libvirt-1.2.0/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
-+++ libvirt-1.1.4/m4/virt-netcontrol.m4
++++ libvirt-1.2.0/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl
diff --git a/libvirt.changes b/libvirt.changes
index 681767d..5df79cf 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec 6 11:03:54 MST 2013 - jfehlig@suse.com
+
+- Update to libvirt 1.2.0
+ - Add support for gluster pool
+ - Separation of python binding
+ - vbox: add support for 4.3 APIs
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Updated and renamed clone.patch to ia64-clone.patch
+
-------------------------------------------------------------------
Wed Dec 4 14:28:14 MST 2013 - jfehlig@suse.com
diff --git a/libvirt.spec b/libvirt.spec
index 8a8d119..67ffe72 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -63,6 +63,7 @@
%define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}}
%define with_storage_rbd 0
%define with_storage_sheepdog 0
+%define with_storage_gluster 0
%define with_numactl 0%{!?_without_numactl:%{server_drivers}}
%define with_selinux 0%{!?_without_selinux:%{server_drivers}}
%define with_apparmor 0%{!?_without_apparmor:%{server_drivers}}
@@ -91,7 +92,6 @@
%define with_libssh2 0%{!?_without_libssh2:0}
# Non-server/HV driver defaults which are always enabled
-%define with_python 0%{!?_without_python:1}
%define with_sasl 0%{!?_without_sasl:1}
# Set the OS / architecture specific special cases
@@ -182,6 +182,7 @@
%define with_storage_mpath 0
%define with_storage_rbd 0
%define with_storage_sheepdog 0
+%define with_storage_gluster 0
%define with_storage_disk 0
%endif
@@ -191,6 +192,13 @@
%define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}}
%define with_libpcap 0%{!?_without_libpcap:%{server_drivers}}
%define with_macvtap 0%{!?_without_macvtap:%{server_drivers}}
+# numad is used to manage the CPU and memory placement dynamically.
+# It is only available on x86, and openSUSE >= 13.1
+%if 0%{?suse_version} >= 1310
+%ifarch i386 i586 i686 x86_64
+%define with_numad 0%{!?_without_numad:%{server_drivers}}
+%endif
+%endif
# Force QEMU to run as qemu:qemu
%define qemu_user qemu
%define qemu_group qemu
@@ -225,7 +233,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 1.1.4
+Version: 1.2.0
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@@ -286,7 +294,7 @@ BuildRequires: libtasn1-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt
BuildRequires: ncurses-devel
-BuildRequires: python-devel
+BuildRequires: python
BuildRequires: python-xml
BuildRequires: readline-devel
BuildRequires: xhtml-dtd
@@ -398,6 +406,9 @@ BuildRequires: audit-devel
# we need /usr/sbin/dtrace
BuildRequires: systemtap-sdt-devel
%endif
+%if %{with_numad}
+BuildRequires: numad
+%endif
Source0: %{name}-%{version}.tar.bz2
Source1: libvirtd.init
@@ -406,7 +417,7 @@ Source99: baselibs.conf
# Upstream patches
# Need to go upstream
Patch100: xen-name-for-devid.patch
-Patch101: clone.patch
+Patch101: ia64-clone.patch
Patch102: xen-pv-cdrom.patch
Patch103: libxl-hvm-vnc.patch
Patch104: libxl-hvm-nic.patch
@@ -491,6 +502,9 @@ Requires: dmidecode
# For service management
%{?systemd_requires}
%endif
+%if %{with_numad}
+Requires: numad
+%endif
%description daemon
Server side daemon required to manage the virtualization capabilities
@@ -898,25 +912,10 @@ connect a user to an LXC container when they login, by switching
namespaces.
%endif
-%if %{with_python}
-
-%package python
-Summary: Python bindings for the libvirt library
-Group: Development/Libraries/C and C++
-Requires: %{name}-client = %{version}-%{release}
-%py_requires
-
-%description python
-The libvirt-python package contains a module that permits applications
-written in the Python programming language to use the interface
-supplied by the libvirt library to use the virtualization capabilities
-of recent versions of Linux (and other OSes).
-%endif
-
%prep
%setup -q
%patch100 -p1
-%patch101
+%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
@@ -999,6 +998,9 @@ of recent versions of Linux (and other OSes).
%if ! %{with_storage_sheepdog}
%define _without_storage_sheepdog --without-storage-sheepdog
%endif
+%if ! %{with_storage_gluster}
+%define _without_storage_gluster --without-storage-gluster
+%endif
%if ! %{with_numactl}
%define _without_numactl --without-numactl
%endif
@@ -1053,9 +1055,6 @@ of recent versions of Linux (and other OSes).
%if ! %{with_avahi}
%define _without_avahi --without-avahi
%endif
-%if ! %{with_python}
-%define _without_python --without-python
-%endif
%if ! %{with_libpcap}
%define _without_libpcap --without-libpcap
%endif
@@ -1091,7 +1090,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
%{?_without_sasl} \
%{?_without_avahi} \
%{?_without_polkit} \
- %{?_without_python} \
%{?_without_libvirtd} \
%{?_without_uml} \
%{?_without_phyp} \
@@ -1108,6 +1106,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
%{?_without_storage_mpath} \
%{?_without_storage_rbd} \
%{?_without_storage_sheepdog} \
+ %{?_without_storage_gluster} \
%{?_without_numactl} \
%{?_without_numad} \
%{?_without_capng} \
@@ -1138,14 +1137,12 @@ gzip -9 ChangeLog
%install
%makeinstall SYSTEMD_UNIT_DIR=%{_unitdir} DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name}
-for i in domain-events/events-c dominfo domsuspend hellolibvirt openauth python xml/nwfilter systemtap
+for i in domain-events/events-c dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap
do
(cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
done
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.la
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.a
%if %{with_driver_modules}
@@ -1215,11 +1212,6 @@ EOF
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
%endif
-%if ! %{with_python}
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-python
-%else
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}/*
-%endif
# init scripts
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
@@ -1668,16 +1660,4 @@ fi
%{_bindir}/virt-login-shell
%endif
-%if %{with_python}
-
-%files python
-%defattr(-, root, root)
-%{py_sitedir}/libvirt.py*
-%{py_sitedir}/libvirt_qemu.py*
-%{py_sitedir}/libvirt_lxc.py*
-%{py_sitedir}/libvirtmod*
-%doc examples/python
-%doc examples/domain-events/events-python
-%endif
-
%changelog
diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch
index ad52bcc..5f6f471 100644
--- a/libvirtd-defaults.patch
+++ b/libvirtd-defaults.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.4/daemon/libvirtd.conf
+Index: libvirt-1.2.0/daemon/libvirtd.conf
===================================================================
---- libvirt-1.1.4.orig/daemon/libvirtd.conf
-+++ libvirt-1.1.4/daemon/libvirtd.conf
+--- libvirt-1.2.0.orig/daemon/libvirtd.conf
++++ libvirt-1.2.0/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@@ -13,10 +13,10 @@ Index: libvirt-1.1.4/daemon/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to
-Index: libvirt-1.1.4/daemon/libvirtd-config.c
+Index: libvirt-1.2.0/daemon/libvirtd-config.c
===================================================================
---- libvirt-1.1.4.orig/daemon/libvirtd-config.c
-+++ libvirt-1.1.4/daemon/libvirtd-config.c
+--- libvirt-1.2.0.orig/daemon/libvirtd-config.c
++++ libvirt-1.2.0/daemon/libvirtd-config.c
@@ -222,7 +222,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0)
return NULL;
diff --git a/libvirtd-init-script.patch b/libvirtd-init-script.patch
index 38431b6..09fbc67 100644
--- a/libvirtd-init-script.patch
+++ b/libvirtd-init-script.patch
@@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
-Index: libvirt-1.1.4/daemon/libvirtd.sysconf
+Index: libvirt-1.2.0/daemon/libvirtd.sysconf
===================================================================
---- libvirt-1.1.4.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.1.4/daemon/libvirtd.sysconf
+--- libvirt-1.2.0.orig/daemon/libvirtd.sysconf
++++ libvirt-1.2.0/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
diff --git a/libxl-hvm-nic.patch b/libxl-hvm-nic.patch
index 9b8b9c5..d589ae5 100644
--- a/libxl-hvm-nic.patch
+++ b/libxl-hvm-nic.patch
@@ -1,8 +1,8 @@
-Index: libvirt-1.1.4/src/libxl/libxl_conf.c
+Index: libvirt-1.2.0/src/libxl/libxl_conf.c
===================================================================
---- libvirt-1.1.4.orig/src/libxl/libxl_conf.c
-+++ libvirt-1.1.4/src/libxl/libxl_conf.c
-@@ -883,8 +883,6 @@ libxlMakeNic(virDomainNetDefPtr l_nic, l
+--- libvirt-1.2.0.orig/src/libxl/libxl_conf.c
++++ libvirt-1.2.0/src/libxl/libxl_conf.c
+@@ -886,8 +886,6 @@ libxlMakeNic(virDomainNetDefPtr l_nic, l
* x_nics[i].mtu = 1492;
*/
@@ -11,7 +11,7 @@ Index: libvirt-1.1.4/src/libxl/libxl_conf.c
virMacAddrGetRaw(&l_nic->mac, x_nic->mac);
if (l_nic->model && !STREQ(l_nic->model, "netfront")) {
-@@ -929,6 +927,8 @@ libxlMakeNicList(virDomainDefPtr def, l
+@@ -932,6 +930,8 @@ libxlMakeNicList(virDomainDefPtr def, l
return -1;
for (i = 0; i < nnics; i++) {
diff --git a/libxl-hvm-vnc.patch b/libxl-hvm-vnc.patch
index e4ecc65..93521dd 100644
--- a/libxl-hvm-vnc.patch
+++ b/libxl-hvm-vnc.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.4/src/libxl/libxl_conf.c
+Index: libvirt-1.2.0/src/libxl/libxl_conf.c
===================================================================
---- libvirt-1.1.4.orig/src/libxl/libxl_conf.c
-+++ libvirt-1.1.4/src/libxl/libxl_conf.c
+--- libvirt-1.2.0.orig/src/libxl/libxl_conf.c
++++ libvirt-1.2.0/src/libxl/libxl_conf.c
@@ -561,6 +561,30 @@ libxlMakeChrdevStr(virDomainChrDefPtr de
}
@@ -33,7 +33,7 @@ Index: libvirt-1.1.4/src/libxl/libxl_conf.c
libxlMakeDomBuildInfo(virDomainObjPtr vm, libxl_domain_config *d_config)
{
virDomainDefPtr def = vm->def;
-@@ -1176,6 +1200,9 @@ libxlBuildDomainConfig(libxlDriverPrivat
+@@ -1174,6 +1198,9 @@ libxlBuildDomainConfig(libxlDriverPrivat
if (libxlMakeVfbList(driver, def, d_config) < 0)
return -1;
diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch
index e190634..3b298a6 100644
--- a/support-managed-pci-xen-driver.patch
+++ b/support-managed-pci-xen-driver.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
-Index: libvirt-1.1.4/src/xenxs/xen_sxpr.c
+Index: libvirt-1.2.0/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-1.1.4.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.1.4/src/xenxs/xen_sxpr.c
+--- libvirt-1.2.0.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.2.0/src/xenxs/xen_sxpr.c
@@ -996,6 +996,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
@@ -78,10 +78,10 @@ Index: libvirt-1.1.4/src/xenxs/xen_sxpr.c
xenFormatSxprPCI(def->hostdevs[i], buf);
}
}
-Index: libvirt-1.1.4/src/xenxs/xen_xm.c
+Index: libvirt-1.2.0/src/xenxs/xen_xm.c
===================================================================
---- libvirt-1.1.4.orig/src/xenxs/xen_xm.c
-+++ libvirt-1.1.4/src/xenxs/xen_xm.c
+--- libvirt-1.2.0.orig/src/xenxs/xen_xm.c
++++ libvirt-1.2.0/src/xenxs/xen_xm.c
@@ -802,6 +802,8 @@ xenParseXM(virConfPtr conf, int xendConf
int busID;
int slotID;
diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch
index c8bf9f4..eefd498 100644
--- a/suse-qemu-conf.patch
+++ b/suse-qemu-conf.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.4/src/qemu/qemu.conf
+Index: libvirt-1.2.0/src/qemu/qemu.conf
===================================================================
---- libvirt-1.1.4.orig/src/qemu/qemu.conf
-+++ libvirt-1.1.4/src/qemu/qemu.conf
+--- libvirt-1.2.0.orig/src/qemu/qemu.conf
++++ libvirt-1.2.0/src/qemu/qemu.conf
@@ -200,7 +200,16 @@
# a special value; security_driver can be set to that value in
# isolation, but it cannot appear in a list of drivers.
diff --git a/systemd-service-xen.patch b/systemd-service-xen.patch
index 1bfa0e5..7728454 100644
--- a/systemd-service-xen.patch
+++ b/systemd-service-xen.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.4/daemon/libvirtd.service.in
+Index: libvirt-1.2.0/daemon/libvirtd.service.in
===================================================================
---- libvirt-1.1.4.orig/daemon/libvirtd.service.in
-+++ libvirt-1.1.4/daemon/libvirtd.service.in
+--- libvirt-1.2.0.orig/daemon/libvirtd.service.in
++++ libvirt-1.2.0/daemon/libvirtd.service.in
@@ -9,6 +9,8 @@ Before=libvirt-guests.service
After=network.target
After=dbus.service
diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch
index bbf1051..1552186 100644
--- a/virtlockd-init-script.patch
+++ b/virtlockd-init-script.patch
@@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards
-Index: libvirt-1.1.4/src/locking/virtlockd.sysconf
+Index: libvirt-1.2.0/src/locking/virtlockd.sysconf
===================================================================
---- libvirt-1.1.4.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.1.4/src/locking/virtlockd.sysconf
+--- libvirt-1.2.0.orig/src/locking/virtlockd.sysconf
++++ libvirt-1.2.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd
+
@@ -12,10 +12,10 @@ Index: libvirt-1.1.4/src/locking/virtlockd.sysconf
#
# Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS=
-Index: libvirt-1.1.4/src/locking/virtlockd.init.in
+Index: libvirt-1.2.0/src/locking/virtlockd.init.in
===================================================================
---- libvirt-1.1.4.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.1.4/src/locking/virtlockd.init.in
+--- libvirt-1.2.0.orig/src/locking/virtlockd.init.in
++++ libvirt-1.2.0/src/locking/virtlockd.init.in
@@ -4,11 +4,13 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
#
diff --git a/xen-name-for-devid.patch b/xen-name-for-devid.patch
index 3390495..b9b18bd 100644
--- a/xen-name-for-devid.patch
+++ b/xen-name-for-devid.patch
@@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is
inactive.
-Index: libvirt-1.1.4/src/xen/xend_internal.c
+Index: libvirt-1.2.0/src/xen/xend_internal.c
===================================================================
---- libvirt-1.1.4.orig/src/xen/xend_internal.c
-+++ libvirt-1.1.4/src/xen/xend_internal.c
+--- libvirt-1.2.0.orig/src/xen/xend_internal.c
++++ libvirt-1.2.0/src/xen/xend_internal.c
@@ -70,7 +70,7 @@
#define XEND_RCV_BUF_MAX_LEN (256 * 1024)
diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch
index d552804..9c946b0 100644
--- a/xen-pv-cdrom.patch
+++ b/xen-pv-cdrom.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.4/src/xenxs/xen_sxpr.c
+Index: libvirt-1.2.0/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-1.1.4.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.1.4/src/xenxs/xen_sxpr.c
+--- libvirt-1.2.0.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.2.0/src/xenxs/xen_sxpr.c
@@ -330,7 +330,7 @@ error:
static int
xenParseSxprDisks(virDomainDefPtr def,