rpms/e2fsprogs/devel e2fsprogs-1.39-blkid-devname.patch, NONE, 1.1 e2fsprogs.spec, 1.61, 1.62

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25425

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.39-blkid-devname.patch 
Log Message:
add patch to fix device mapper naming in libblkid


e2fsprogs-1.39-blkid-devname.patch:
 devname.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE e2fsprogs-1.39-blkid-devname.patch ---
--- e2fsprogs-1.39/lib/blkid/devname.c.foo	2006-07-20 16:48:07.000000000 -0400
+++ e2fsprogs-1.39/lib/blkid/devname.c	2006-07-20 16:48:18.000000000 -0400
@@ -291,7 +291,7 @@
 
 		names = (void *)names + next;
 
-		rc = asprintf(&device, "/dev/mapper/%s", names->name);
+		rc = asprintf(&device, "mapper/%s", names->name);
 		if (rc < 0)
 			goto try_next;
 


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- e2fsprogs.spec	12 Jul 2006 05:43:14 -0000	1.61
+++ e2fsprogs.spec	20 Jul 2006 21:05:10 -0000	1.62
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.39
-Release: 2.1
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch34: e2fsprogs-1.39-blkid-devmapper.patch
 Patch36: e2fsprogs-1.38-etcblkid.patch
 Patch37: e2fsprogs-1.39-blkid-gfs.patch
+Patch38: e2fsprogs-1.39-blkid-devname.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -71,6 +72,8 @@
 %patch36 -p1 -b .etcblkid
 # GFS/GFS2 detection
 %patch37 -p1 -b .gfs
+# Fix device mapper names in blkid
+%patch38 -p1 -b .devname
 
 %build
 aclocal
@@ -222,7 +225,10 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 20 2006 Bill Nottingham <notting at redhat.com> - 1.39-3
+- prevent libblkid returning /dev/dm-X
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.39-2.1
 - rebuild
 
 * Mon Jul 10 2006 Karel Zak <kzak at redhat.com> - 1.39-2