rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-devmapper.patch, 1.2, 1.3 e2fsprogs.spec, 1.54, 1.55

[fedora-cvs-commits at redhat.com]

Author: notting

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

Modified Files:
	e2fsprogs-1.38-blkid-devmapper.patch e2fsprogs.spec 
Log Message:
don't prepend DM device names with /dev/ ; this confuses probe_one()


e2fsprogs-1.38-blkid-devmapper.patch:
 MCONFIG.in            |    3 
 configure.in          |   30 ++++++++
 e2fsck/Makefile.in    |    2 
 lib/blkid/Makefile.in |    4 -
 lib/blkid/blkid.pc.in |    2 
 lib/blkid/blkidP.h    |    1 
 lib/blkid/devname.c   |  176 ++++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 214 insertions(+), 4 deletions(-)

Index: e2fsprogs-1.38-blkid-devmapper.patch
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-blkid-devmapper.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2fsprogs-1.38-blkid-devmapper.patch	21 Mar 2006 22:01:01 -0000	1.2
+++ e2fsprogs-1.38-blkid-devmapper.patch	14 Jun 2006 01:41:44 -0000	1.3
@@ -265,7 +265,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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- e2fsprogs.spec	21 Mar 2006 22:01:02 -0000	1.54
+++ e2fsprogs.spec	14 Jun 2006 01:41:44 -0000	1.55
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 14
+Release: 15
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -310,6 +310,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Jun 13 2006 Bill Nottingham <notting at redhat.com> - 1.38-15
+- prevent libblkid returning /dev/dm-X
+
 * Tue Mar 21 2006 Karel Zak <kzak at redhat.com> - 1.38-14
 - prevent error messages to stderr caused by libblkid calling libdevmapper