add patch to fix device mapper naming in libblkid

This commit is contained in:
Bill Nottingham 2006-07-20 21:05:10 +00:00
parent 4b39886489
commit 3a2fbf331d
2 changed files with 19 additions and 2 deletions

View File

@ -0,0 +1,11 @@
--- 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;

View File

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