devel/lvm2 lvm2-limits-include.patch, NONE, 1.1 lvm2-vio-disk.patch, 1.1, 1.2 lvm2.spec, 1.132, 1.133

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/lvm2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14066

Modified Files:
	lvm2-vio-disk.patch lvm2.spec 
Added Files:
	lvm2-limits-include.patch 
Log Message:
* Wed Apr  2 2008 Jeremy Katz <katzj at redhat.com> - 2.02.33-11
- Adjust for new name for vio disks (from danpb)
- And fix the build (also from danpb)


lvm2-limits-include.patch:

--- NEW FILE lvm2-limits-include.patch ---
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"

lvm2-vio-disk.patch:

Index: lvm2-vio-disk.patch
===================================================================
RCS file: /cvs/pkgs/devel/lvm2/lvm2-vio-disk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lvm2-vio-disk.patch	5 Mar 2008 15:53:33 -0000	1.1
+++ lvm2-vio-disk.patch	3 Apr 2008 03:21:02 -0000	1.2
@@ -5,7 +5,7 @@
  	{"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}
  };
  


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/devel/lvm2/lvm2.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- lvm2.spec	5 Mar 2008 15:53:33 -0000	1.132
+++ lvm2.spec	3 Apr 2008 03:21:02 -0000	1.133
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Wed Apr  2 2008 Jeremy Katz <katzj at 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 at redhat.com> - 2.02.33-10
 - recognize vio disks