packages: libvirt/libvirt-sasl.patch, libvirt/libvirt.spec - up to 0.9.1 - ...

alucard alucard at pld-linux.org
Thu May 5 16:03:03 CEST 2011


Author: alucard                      Date: Thu May  5 14:03:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.9.1
- netcf put into with statement (segfaults with our libnl1)
- BR reordered, PolicyKit -> polkit
- some R filled

---- Files affected:
packages/libvirt:
   libvirt-sasl.patch (1.1 -> 1.2) , libvirt.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/libvirt/libvirt-sasl.patch
diff -u packages/libvirt/libvirt-sasl.patch:1.1 packages/libvirt/libvirt-sasl.patch:1.2
--- packages/libvirt/libvirt-sasl.patch:1.1	Thu Apr 28 11:48:22 2011
+++ packages/libvirt/libvirt-sasl.patch	Thu May  5 16:02:58 2011
@@ -281,6 +281,6 @@
      driver.vncSASL = 1;
 -    driver.vncSASLdir = strdup("/root/.sasl2");
 +    driver.vncSASLdir = strdup("/root/.sasl");
-     DO_TEST("graphics-vnc-sasl", QEMUD_CMD_FLAG_VGA, false);
+     DO_TEST("graphics-vnc-sasl", false, QEMU_CAPS_VGA);
      driver.vncTLS = 1;
      driver.vncTLSx509verify = 1;

================================================================
Index: packages/libvirt/libvirt.spec
diff -u packages/libvirt/libvirt.spec:1.29 packages/libvirt/libvirt.spec:1.30
--- packages/libvirt/libvirt.spec:1.29	Thu Apr 28 12:00:41 2011
+++ packages/libvirt/libvirt.spec	Thu May  5 16:02:58 2011
@@ -6,6 +6,7 @@
 %bcond_without	qemu		# Qemu
 %bcond_without	polkit		# PolicyKit
 %bcond_with	lokkit		# Lokkit
+%bcond_with	netcf		# host interfaces support
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch %{ix86} %{x8664} ia64
@@ -25,19 +26,17 @@
 
 Summary:	Toolkit to interact with virtualization capabilities
 Name:		libvirt
-Version:	0.8.8
-Release:	4
+Version:	0.9.1
+Release:	0.1
 License:	LGPL
 Group:		Base/Kernel
 URL:		http://www.libvirt.org/
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5:	ac9235576352b84b8cb17df7456bbdfc
+# Source0-md5:	4182dbe290cca4344a5387950dc06433
 Source1:	%{name}.init
 Patch0:		gcrypt.patch
 Patch1:		%{name}-sasl.patch
 %{?with_lokkit:BuildRequires:	/usr/sbin/lokkit}
-%{?with_polkit:BuildRequires:	PolicyKit >= 0.6}
-%{?with_polkit:BuildRequires:	PolicyKit-devel >= 0.6}
 BuildRequires:	augeas-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -56,29 +55,39 @@
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.6.0
 BuildRequires:	libxslt-devel
+# For ISCSI driver
+BuildRequires:	open-iscsi
 BuildRequires:	openldap-devel
 BuildRequires:	ncurses-devel
-BuildRequires:	netcf-devel >= 0.1.4
+%{?with_netcf:BuildRequires:	netcf-devel >= 0.1.4}
 BuildRequires:	numactl-devel
+BuildRequires:	parted-devel >= 1.8.0
 BuildRequires:	perl-tools-pod
+%{?with_polkit:BuildRequires:	polkit >= 0.90}
 BuildRequires:	pkgconfig
+BuildRequires:	python
 BuildRequires:	python-devel
 BuildRequires:	readline-devel
+BuildRequires:	readline-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sqlite3-devel
 BuildRequires:	udev-devel >= 145
 # For mount/umount in FS driver
 BuildRequires:	util-linux
 %{?with_xen:BuildRequires:	xen-devel >= 3.0.4}
-# For ISCSI driver
-BuildRequires:	open-iscsi
 # For disk driver
-BuildRequires:	parted-devel >= 1.8.0
-BuildRequires:	python
-BuildRequires:	python-devel
-BuildRequires:	readline-devel
 BuildRequires:	xmlrpc-c-devel
 BuildRequires:	xorg-lib-libpciaccess-devel
+BuildRequires:	yajl-devel
+Requires:	bridge-utils
+Requires:	dmidecode
+Requires:	dnsmasq
+Requires:	ebtables
+Requires:	gawk
+Requires:	iptables
+Requires:	polkit
+# for management through ssh
+Requires:	netcat-openbsd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # libxenstore is not versionned properly
@@ -149,7 +158,6 @@
 %setup -q
 #%patch0 -p1
 %patch1 -p1
-
 # weird translations
 rm -f po/{my,eu_ES}.{po,gmo}
 
@@ -168,6 +176,7 @@
 	--x-libraries=%{_libdir} \
 	%{!?with_xen:--without-xen} \
 	%{!?with_qemu:--without-qemu} \
+	%{!?with_netcf:--without-netcf} \
 	--with-init-script=redhat \
 	--with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid \
 	--with-storage-lvm \
@@ -185,7 +194,10 @@
 	     VGS=/sbin/vgs      \
 	     LVS=/sbin/lvs      \
 	   BRCTL=/sbin/brctl    \
-	SHOWMOUNT=/usr/sbin/showmount
+	SHOWMOUNT=/usr/sbin/showmount \
+	IPTABLES_PATH=/usr/sbin/iptables \
+	IP6TABLES_PATH=/usr/sbin/ip6tables \
+	EBTABLES_PATH=/usr/sbin/ebtables
 
 %{__make} AWK=gawk
 
@@ -214,6 +226,7 @@
 %doc ChangeLog README TODO NEWS
 %attr(755,root,root) %{_libdir}/%{name}*.so.*
 %attr(755,root,root) %{_libdir}/libvirt_lxc
+%attr(755,root,root) %{_libdir}/libvirt_iohelper
 %{?with_polkit:%{_datadir}/polkit-1/actions/org.libvirt.unix.policy}
 %dir %{_datadir}/libvirt
 %dir %{_datadir}/libvirt/schemas
@@ -242,6 +255,7 @@
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/%{name}.a
+%{_libdir}/%{name}-qemu.a
 
 %files -n python-%{name}
 %defattr(644,root,root,755)
@@ -262,6 +276,7 @@
 %attr(755,root,root) %{_bindir}/virt-pki-validate
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirtd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests
+%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.lxc
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.qemu
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.uml
@@ -283,6 +298,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2011/05/05 14:02:58  alucard
+- up to 0.9.1
+- netcf put into with statement (segfaults with our libnl1)
+- BR reordered, PolicyKit -> polkit
+- some R filled
+
 Revision 1.29  2011/04/28 10:00:41  baggins
 - rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvirt/libvirt-sasl.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvirt/libvirt.spec?r1=1.29&r2=1.30&f=u



More information about the pld-cvs-commit mailing list