From 623cbaaa4bddeb1129b4db693edf883a26e4102d Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Apr 03 2008 03:21:02 +0000
Subject: - Adjust for new name for vio disks (from danpb)

- And fix the build (also from danpb)

---

diff --git a/lvm2-limits-include.patch b/lvm2-limits-include.patch
new file mode 100644
index 0000000..cea1d0a
--- /dev/null
+++ b/lvm2-limits-include.patch
@@ -0,0 +1,11 @@
+diff -rup LVM2.2.02.33.orig/daemons/clvmd/clvmd.c LVM2.2.02.33.new/daemons/clvmd/clvmd.c
+--- LVM2.2.02.33.orig/daemons/clvmd/clvmd.c	2007-11-15 05:16:14.000000000 -0500
++++ LVM2.2.02.33.new/daemons/clvmd/clvmd.c	2008-04-02 14:40:13.000000000 -0400
+@@ -38,6 +38,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <libdlm.h>
++#include <limits.h>
+ 
+ #include "clvmd-comms.h"
+ #include "lvm-functions.h"
diff --git a/lvm2-vio-disk.patch b/lvm2-vio-disk.patch
index c6315e3..5bd782e 100644
--- a/lvm2-vio-disk.patch
+++ b/lvm2-vio-disk.patch
@@ -5,7 +5,7 @@ diff -up LVM2.2.02.33/lib/filters/filter.c.vio LVM2.2.02.33/lib/filters/filter.c
  	{"xvd", 16},		/* Xen virtual block device */
  	{"vdisk", 8},		/* SUN's LDOM virtual block device */
  	{"ps3disk", 16},	/* PlayStation 3 internal disk */
-+	{"vd", 8},              /* VirtIO disk */
++	{"virtblk", 8},         /* VirtIO disk */
  	{NULL, 0}
  };
  
diff --git a/lvm2.spec b/lvm2.spec
index adc787d..ad3755c 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -6,7 +6,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.33
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -14,6 +14,7 @@ Source0: LVM2.%{version}.tgz
 Source1: device-mapper.%{device_mapper_version}.tgz
 Patch0: cluster-locking-built-in.patch
 Patch1: lvm2-vio-disk.patch
+Patch2: lvm2-limits-include.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
@@ -38,6 +39,7 @@ or more physical volumes and creating one or more logical volumes
 %setup -q -T -D -a 1 -n LVM2.%{version}
 %patch -p1 -b .locking
 %patch1 -p1 
+%patch2 -p1
 
 %build
 cd device-mapper.%{device_mapper_version}
@@ -269,6 +271,10 @@ This package contains the device-mapper shared library, libdevmapper.
 
 
 %changelog
+* Wed Apr  2 2008 Jeremy Katz <katzj@redhat.com> - 2.02.33-11
+- Adjust for new name for vio disks (from danpb)
+- And fix the build (also from danpb)
+
 * Wed Mar  5 2008 Jeremy Katz <katzj@redhat.com> - 2.02.33-10
 - recognize vio disks