rpms/xen/devel .cvsignore, 1.34.2.4, 1.34.2.5 sources, 1.48.2.5, 1.48.2.6 xen.spec, 1.194.2.13, 1.194.2.14 pygrub-manykernels.patch, 1.1, NONE

[Daniel P. Berrange (berrange)]

Author: berrange

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

Modified Files:
      Tag: private-berrange-xen-unstable
	.cvsignore sources xen.spec 
Removed Files:
      Tag: private-berrange-xen-unstable
	pygrub-manykernels.patch 
Log Message:
Rebase to 3.2 rc5 changeset 16701


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.34.2.4
retrieving revision 1.34.2.5
diff -u -r1.34.2.4 -r1.34.2.5
--- .cvsignore	21 Dec 2007 18:43:41 -0000	1.34.2.4
+++ .cvsignore	10 Jan 2008 21:00:00 -0000	1.34.2.5
@@ -1,3 +1,3 @@
 *.rpm
 .build*.log
-xen-unstable-16656.tgz
+xen-unstable-16701.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.6
diff -u -r1.48.2.5 -r1.48.2.6
--- sources	21 Dec 2007 18:43:41 -0000	1.48.2.5
+++ sources	10 Jan 2008 21:00:00 -0000	1.48.2.6
@@ -1 +1 @@
-d07a1dd98e86e13ecdf6935ed92c7c45  xen-unstable-16656.tgz
+352aa610761be3cae89f9e7caa4f0feb  xen-unstable-16701.tgz


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.194.2.13
retrieving revision 1.194.2.14
diff -u -r1.194.2.13 -r1.194.2.14
--- xen.spec	21 Dec 2007 18:43:41 -0000	1.194.2.13
+++ xen.spec	10 Jan 2008 21:00:00 -0000	1.194.2.14
@@ -18,14 +18,14 @@
 # dev tree is targetted to become,
 
 # For dev trees, also set the changeset synced to
-%define changeset 16656
+%define changeset 16701
 
 # Name of the tree (ie the arg to hg archive, without .tgz suffix)
 %define tree unstable
 #define tree 3.1-testing
 
 # If upstream tree is also in release candidate stage, add this tag
-%define relcandidate 3
+%define relcandidate 5
 
 
 
@@ -74,8 +74,6 @@
 Patch102: xen-3.0.2-config-allow-unix-server.patch
 Patch103: xen-3.0.2-config-disable-reloc.patch
 
-Patch251: pygrub-manykernels.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 
@@ -162,9 +160,6 @@
 %patch102 -p1
 %patch103 -p1
 
-# upstream patches
-%patch251 -p1
-
 %build
 %if %{hv_build}
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs xen


--- pygrub-manykernels.patch DELETED ---