From b918b9d89cfa947e7345e1d855d0db5b1dec8504 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@fedoraproject.org>
Date: Mar 06 2009 09:22:27 +0000
Subject: misc fixes


---

diff --git a/xen.modules b/xen.modules
index c8785a6..6aa1bb0 100644
--- a/xen.modules
+++ b/xen.modules
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-test -f /proc/xen/capabilities || exit 0
-grep -q "control_d" /proc/xen/capabilities || exit 0
+test -d /proc/xen				|| exit 0
+test -f /proc/xen/capabilities			|| mount -t xenfs xen /proc/xen
+test -f /proc/xen/capabilities			|| exit 0
+grep -q "control_d" /proc/xen/capabilities	|| exit 0
 
-for m in blkbk netbk blktap xenblktap
+for module in evtchn blkbk netbk
 do
-  modprobe $m >/dev/null 2>&1
+	modprobe $m >/dev/null 2>&1
 done
diff --git a/xen.spec b/xen.spec
index 4ec9d82..7d1282b 100644
--- a/xen.spec
+++ b/xen.spec
@@ -2,7 +2,7 @@
 
 # Always set these 3 tags
 %define base_version 3.3.1
-%define base_release 7
+%define base_release 8
 
 # Hypervisor ABI
 %define hv_abi  3.3
@@ -113,7 +113,7 @@ Requires: xen-runtime = %{version}-%{release}
 # installs xen.
 Requires: kpartx
 Prereq: chkconfig
-ExclusiveArch: i386 i586 i686 x86_64 ia64
+ExclusiveArch: %{ix86} x86_64 ia64
 
 %description
 This package contains the XenD daemon and xm command line
@@ -195,6 +195,7 @@ cd ../../
 cp -v %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
 
 %build
+export XEN_VENDORVERSION="-%{release_tag}"
 %if %{hv_build}
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs xen
 %{__make} stubdom
@@ -499,6 +500,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Fri Mar 6 2009 Gerd Hoffmann <kraxel@redhat.com> - 3.3.1-8
+- fix xen.modules init script for pv_ops kernel.
+- stick rpm release tag into XEN_VENDORVERSION.
+- use %{ix86} macro in ExclusiveArch.
+
 * Mon Mar 2 2009 Gerd Hoffmann <kraxel@redhat.com> - 3.3.1-7
 - fix xenstored init script for pv_ops kernel.