- up to 3.0.3_0

Changed files:
    xen-python_scripts.patch -> 1.2
    xen.spec -> 1.35

diff --git a/xen-python_scripts.patch b/xen-python_scripts.patch
index 36e218de7446793e627bf7d1316aa417de6c8485..e1e3df8ac6f65f3f590d92305f090e52ae55c17e 100644 (file)
--- a/xen-python_scripts.patch
+++ b/xen-python_scripts.patch
@@ -1,132 +1,123 @@
-diff -dru xen-3.0.2.orig/tools/check/check_logging xen-3.0.2/tools/check/check_logging
---- xen-3.0.2.orig/tools/check/check_logging   2006-04-10 00:05:52.000000000 +0200
-+++ xen-3.0.2/tools/check/check_logging        2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/check/check_logging xen-3.0.3_0-src/tools/check/check_logging
+--- xen-3.0.3_0-src.orig/tools/check/check_logging     2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/check/check_logging  2006-10-30 15:26:46.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  #  -*- mode: python; -*-
  
  import os
-diff -dru xen-3.0.2.orig/tools/ioemu/keymaps/convert-map xen-3.0.2/tools/ioemu/keymaps/convert-map
---- xen-3.0.2.orig/tools/ioemu/keymaps/convert-map     2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/ioemu/keymaps/convert-map  2006-04-30 20:13:13.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/python
- # -*-Python-*-
- #
- # 
-diff -dru xen-3.0.2.orig/tools/misc/netfix xen-3.0.2/tools/misc/netfix
---- xen-3.0.2.orig/tools/misc/netfix   2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/misc/netfix        2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/misc/netfix xen-3.0.3_0-src/tools/misc/netfix
+--- xen-3.0.3_0-src.orig/tools/misc/netfix     2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/misc/netfix  2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  #  -*- mode: python; -*-
  #============================================================================
  # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
-diff -dru xen-3.0.2.orig/tools/misc/xen-bugtool xen-3.0.2/tools/misc/xen-bugtool
---- xen-3.0.2.orig/tools/misc/xen-bugtool      2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/misc/xen-bugtool   2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/misc/xen-bugtool xen-3.0.3_0-src/tools/misc/xen-bugtool
+--- xen-3.0.3_0-src.orig/tools/misc/xen-bugtool        2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/misc/xen-bugtool     2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
  #  -*- mode: python; -*-
  
-diff -dru xen-3.0.2.orig/tools/misc/xencons xen-3.0.2/tools/misc/xencons
---- xen-3.0.2.orig/tools/misc/xencons  2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/misc/xencons       2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/misc/xencons xen-3.0.3_0-src/tools/misc/xencons
+--- xen-3.0.3_0-src.orig/tools/misc/xencons    2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/misc/xencons 2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
  ##############################################
  # Console client for Xen guest OSes
-diff -dru xen-3.0.2.orig/tools/misc/xend xen-3.0.2/tools/misc/xend
---- xen-3.0.2.orig/tools/misc/xend     2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/misc/xend  2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/misc/xend xen-3.0.3_0-src/tools/misc/xend
+--- xen-3.0.3_0-src.orig/tools/misc/xend       2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/misc/xend    2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  #  -*- mode: python; -*-
  #============================================================================
  # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
-diff -dru xen-3.0.2.orig/tools/misc/xensymoops xen-3.0.2/tools/misc/xensymoops
---- xen-3.0.2.orig/tools/misc/xensymoops       2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/misc/xensymoops    2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/misc/xensymoops xen-3.0.3_0-src/tools/misc/xensymoops
+--- xen-3.0.3_0-src.orig/tools/misc/xensymoops 2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/misc/xensymoops      2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
  # An oops analyser for Xen
  # Usage: xensymoops path-to-xen.s < oops-message
-diff -dru xen-3.0.2.orig/tools/misc/xm xen-3.0.2/tools/misc/xm
---- xen-3.0.2.orig/tools/misc/xm       2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/misc/xm    2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/misc/xm xen-3.0.3_0-src/tools/misc/xm
+--- xen-3.0.3_0-src.orig/tools/misc/xm 2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/misc/xm      2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  #  -*- mode: python; -*-
  import sys
  
-diff -dru xen-3.0.2.orig/tools/python/xen/util/bugtool.py xen-3.0.2/tools/python/xen/util/bugtool.py
---- xen-3.0.2.orig/tools/python/xen/util/bugtool.py    2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/python/xen/util/bugtool.py 2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/python/xen/util/bugtool.py xen-3.0.3_0-src/tools/python/xen/util/bugtool.py
+--- xen-3.0.3_0-src.orig/tools/python/xen/util/bugtool.py      2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/python/xen/util/bugtool.py   2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -dru xen-3.0.2.orig/tools/python/xen/util/pci.py xen-3.0.2/tools/python/xen/util/pci.py
---- xen-3.0.2.orig/tools/python/xen/util/pci.py        2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/python/xen/util/pci.py     2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/python/xen/util/pci.py xen-3.0.3_0-src/tools/python/xen/util/pci.py
+--- xen-3.0.3_0-src.orig/tools/python/xen/util/pci.py  2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/python/xen/util/pci.py       2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  #
  # PCI Device Information Class
  # - Helps obtain information about which I/O resources a PCI device needs
-diff -dru xen-3.0.2.orig/tools/python/xen/xend/XendClient.py xen-3.0.2/tools/python/xen/xend/XendClient.py
---- xen-3.0.2.orig/tools/python/xen/xend/XendClient.py 2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/python/xen/xend/XendClient.py      2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/python/xen/xend/sxp.py xen-3.0.3_0-src/tools/python/xen/xend/sxp.py
+--- xen-3.0.3_0-src.orig/tools/python/xen/xend/sxp.py  2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/python/xen/xend/sxp.py       2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  #============================================================================
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -dru xen-3.0.2.orig/tools/python/xen/xend/sxp.py xen-3.0.2/tools/python/xen/xend/sxp.py
---- xen-3.0.2.orig/tools/python/xen/xend/sxp.py        2006-04-10 00:05:53.000000000 +0200
-+++ xen-3.0.2/tools/python/xen/xend/sxp.py     2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/python/xen/xend/XendClient.py xen-3.0.3_0-src/tools/python/xen/xend/XendClient.py
+--- xen-3.0.3_0-src.orig/tools/python/xen/xend/XendClient.py   2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/python/xen/xend/XendClient.py        2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  #============================================================================
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -dru xen-3.0.2.orig/tools/vnet/scripts/vn xen-3.0.2/tools/vnet/scripts/vn
---- xen-3.0.2.orig/tools/vnet/scripts/vn       2006-04-10 00:05:54.000000000 +0200
-+++ xen-3.0.2/tools/vnet/scripts/vn    2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/vnet/scripts/vn xen-3.0.3_0-src/tools/vnet/scripts/vn
+--- xen-3.0.3_0-src.orig/tools/vnet/scripts/vn 2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/vnet/scripts/vn      2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.4
 +#!/usr/bin/python
  #  -*- mode: python; -*-
  #============================================================================
  # Copyright (C) 2005, 2006 Mike Wray <mike.wray@hp.com>
-diff -dru xen-3.0.2.orig/tools/xenmon/xenmon.py xen-3.0.2/tools/xenmon/xenmon.py
---- xen-3.0.2.orig/tools/xenmon/xenmon.py      2006-04-10 00:05:54.000000000 +0200
-+++ xen-3.0.2/tools/xenmon/xenmon.py   2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/xenmon/xenmon.py xen-3.0.3_0-src/tools/xenmon/xenmon.py
+--- xen-3.0.3_0-src.orig/tools/xenmon/xenmon.py        2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/xenmon/xenmon.py     2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  
  #####################################################################
  # xenmon is a front-end for xenbaked.
-diff -dru xen-3.0.2.orig/tools/xentrace/xentrace_format xen-3.0.2/tools/xentrace/xentrace_format
---- xen-3.0.2.orig/tools/xentrace/xentrace_format      2006-04-10 00:05:54.000000000 +0200
-+++ xen-3.0.2/tools/xentrace/xentrace_format   2006-04-30 20:13:13.000000000 +0200
+diff -urN xen-3.0.3_0-src.orig/tools/xentrace/xentrace_format xen-3.0.3_0-src/tools/xentrace/xentrace_format
+--- xen-3.0.3_0-src.orig/tools/xentrace/xentrace_format        2006-10-15 14:22:03.000000000 +0200
++++ xen-3.0.3_0-src/tools/xentrace/xentrace_format     2006-10-30 15:26:47.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python

diff --git a/xen.spec b/xen.spec
index 4935b248b73c533f3f1d26c92dfc0729adc0bfe1..ca24a21a91662649e63728cdc70c5b2a72e2e8aa 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -8,18 +8,17 @@
 Summary:       Xen - a virtual machine monitor
 Summary(pl):   Xen - monitor maszyny wirtualnej
 Name:          xen
-Version:       3.0.2
+Version:       3.0.3_0
 Release:       0.3
 License:       GPL
 Group:         Applications/System
-Source0:       http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/%{name}-%{version}-src.tgz
-# Source0-md5: 544eab940a0734a55459d648e5c3b224
+Source0:       http://bits.xensource.com/oss-xen/release/3.0.3-0/src.tgz/%{name}-%{version}-src.tgz
+# Source0-md5: 75d895858a467405114599abf94d60a2
 Source1:       %{name}-xend.init
 Source2:       %{name}-xendomains.init
 Patch0:                %{name}-python_scripts.patch
 Patch1:                %{name}-bash_scripts.patch
-Patch2:                %{name}-bridge_setup.patch
-Patch3:                %{name}-xenstore-version.patch
+#Patch2:               %{name}-bridge_setup.patch
 URL:           http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 BuildRequires: XFree86-devel
 BuildRequires: curl-devel
@@ -48,6 +47,8 @@ Obsoletes:    xen-doc
 ExclusiveArch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _version        %(echo %{version} | sed -e 's/_/-/')
+
 %ifnarch i686 athlon pentium3 pentium4
 %undefine      with_pae
 %endif
@@ -103,11 +104,10 @@ Static xen libraries.
 Statyczne biblioteki xena.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-src
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch2 -p1
 
 chmod -R u+w .
 
@@ -170,15 +170,15 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog README docs/misc/*
+%doc COPYING README docs/misc/*
 %doc docs/html/*
-/boot/%{name}-syms-%{version}
-/boot/%{name}-%{version}.gz
+/boot/%{name}-syms-%{_version}
+/boot/%{name}-%{_version}.gz
 /boot/%{name}.gz
 %attr(754,root,root) /etc/rc.d/init.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/*
-%attr(755,root,root) /etc/hotplug/*
+#%attr(755,root,root) /etc/hotplug/*
 %dir %{_sysconfdir}/xen
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/qemu-ifup
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/*.*