Thu Nov 1 17:33:55 UTC 2007

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13726

Modified Files:
      Tag: private-berrange-xen-unstable
	.cvsignore sources xen.spec 
Removed Files:
      Tag: private-berrange-xen-unstable
	xen-net-bridge.patch xen-pvfb-01-qemu-fv-machine.patch 
	xen-pvfb-02-qemu-pv-machine.patch 
	xen-pvfb-03-xenfb-remove.patch 
	xen-pvfb-04-xenfb-event-handlers.patch 
	xen-pvfb-05-xenfb-qemu-console.patch 
	xen-pvfb-06-xenfb-pubpriv-merge.patch 
	xen-pvfb-07-xenfb-async-startup.patch 
	xen-pvfb-08-xen-console-qemu.patch 
	xen-pvfb-09-xend-device-model.patch 
	xen-pvfb-10-xen-console-ignore.patch 
	xen-pvfb-11-nodename.patch xen-qemu-iohandler-delete.patch 
	xen-qemu-vnc-authentication.patch 
	xen-qemu-vnc-revert-password.patch 
	xen-qemu-vnc-x509-certs.patch xen-xs-transactions.patch 
Log Message:
Sync to xen-devel 3.2 snapshot changeset 16281


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -r1.34.2.1 -r1.34.2.2

--- .cvsignore	19 Oct 2007 23:35:08 -0000	1.34.2.1
+++ .cvsignore	1 Nov 2007 17:33:22 -0000	1.34.2.2
@@ -1,4 +1,3 @@
-xen-3.1.0-src.tgz
 *.rpm
 .build*.log
-xen-unstable.hg-16125.tar.gz
+xen-unstable.hg-16281.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -r1.48.2.1 -r1.48.2.2
--- sources	19 Oct 2007 23:35:08 -0000	1.48.2.1
+++ sources	1 Nov 2007 17:33:22 -0000	1.48.2.2
@@ -1,2 +1 @@
 b7ae1f652b071862ae4c90b72d549627  xen-3.1.0-src.tgz
-af3195e979c055b878bef986f7d60bde  xen-unstable.hg-16125.tar.gz


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.194.2.6
retrieving revision 1.194.2.7
diff -u -r1.194.2.6 -r1.194.2.7
--- xen.spec	29 Oct 2007 21:24:26 -0000	1.194.2.6
+++ xen.spec	1 Nov 2007 17:33:23 -0000	1.194.2.7
@@ -1,11 +1,11 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define changeset 16125
+%define changeset 16281
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.1
-Release: 0%{?dist}.7unstable
+Release: 0%{?dist}.1unstable
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -15,7 +15,6 @@
 Source4: %{name}.logrotate
 Patch1: xen-initscript.patch
 Patch3: xen-compile-fixes.patch
-Patch6: xen-net-bridge.patch
 Patch13: xen-dumpdir.patch
 Patch18: xen-block-readonly.patch
 
@@ -26,29 +25,8 @@
 Patch102: xen-3.0.2-config-allow-unix-server.patch
 Patch103: xen-3.0.2-config-disable-reloc.patch
 
-Patch160: xen-pvfb-01-qemu-fv-machine.patch
-Patch161: xen-pvfb-02-qemu-pv-machine.patch
-Patch162: xen-pvfb-03-xenfb-remove.patch
-Patch163: xen-pvfb-04-xenfb-event-handlers.patch
-Patch164: xen-pvfb-05-xenfb-qemu-console.patch
-Patch165: xen-pvfb-06-xenfb-pubpriv-merge.patch
-Patch166: xen-pvfb-07-xenfb-async-startup.patch
-Patch167: xen-pvfb-08-xen-console-qemu.patch
-Patch168: xen-pvfb-09-xend-device-model.patch
-Patch169: xen-pvfb-10-xen-console-ignore.patch
-Patch170: xen-pvfb-11-nodename.patch
-
-Patch171: xen-qemu-vnc-revert-password.patch
-
-Patch172: xen-qemu-iohandler-delete.patch
-Patch173: xen-qemu-vnc-authentication.patch
-Patch174: xen-qemu-vnc-x509-certs.patch
-
 Patch251: pygrub-manykernels.patch
 
-# Performance fix for listing domains
-Patch280: xen-xs-transactions.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -113,7 +91,6 @@
 %setup -q -n %{name}-unstable.hg-%{changeset}
 %patch1 -p1 -b .init
 %patch3 -p1 -b .compile
-#patch6 -p1
 %patch13 -p1
 %patch18 -p1
 
@@ -124,33 +101,9 @@
 %patch102 -p1
 %patch103 -p1
 
-# Switch to QEMU for paravirt VNC server
-%patch160 -p1
-%patch161 -p1
-%patch162 -p1
-%patch163 -p1
-%patch164 -p1
-%patch165 -p1
-%patch166 -p1
-%patch167 -p1
-%patch168 -p1
-%patch169 -p1
-%patch170 -p1
-
-# Remove old VNC password code
-%patch171 -p1
-
-# Add new TLS code
-%patch172 -p1
-%patch173 -p1
-%patch174 -p1
-
 # upstream patches
 %patch251 -p1
 
-# performance patch
-%patch280 -p1
-
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
 


--- xen-net-bridge.patch DELETED ---


--- xen-pvfb-01-qemu-fv-machine.patch DELETED ---


--- xen-pvfb-02-qemu-pv-machine.patch DELETED ---


--- xen-pvfb-03-xenfb-remove.patch DELETED ---


--- xen-pvfb-04-xenfb-event-handlers.patch DELETED ---


--- xen-pvfb-05-xenfb-qemu-console.patch DELETED ---


--- xen-pvfb-06-xenfb-pubpriv-merge.patch DELETED ---


--- xen-pvfb-07-xenfb-async-startup.patch DELETED ---


--- xen-pvfb-08-xen-console-qemu.patch DELETED ---


--- xen-pvfb-09-xend-device-model.patch DELETED ---


--- xen-pvfb-10-xen-console-ignore.patch DELETED ---


--- xen-pvfb-11-nodename.patch DELETED ---


--- xen-qemu-iohandler-delete.patch DELETED ---


--- xen-qemu-vnc-authentication.patch DELETED ---


--- xen-qemu-vnc-revert-password.patch DELETED ---


--- xen-qemu-vnc-x509-certs.patch DELETED ---


--- xen-xs-transactions.patch DELETED ---


