diff options
| author | Bill Nottingham <notting@fedoraproject.org> | 2006-07-20 21:05:10 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@fedoraproject.org> | 2006-07-20 21:05:10 +0000 |
| commit | 3a2fbf331d1c364bca6bbca0741d00f3e82265df (patch) | |
| tree | 36eb12a98d2744c78f49010066be85f506847c47 | |
| parent | 4b3988648971beb9741d28248f36a3a0f9148e41 (diff) | |
| download | e2fsprogs-3a2fbf331d1c364bca6bbca0741d00f3e82265df.tar.gz e2fsprogs-3a2fbf331d1c364bca6bbca0741d00f3e82265df.tar.xz e2fsprogs-3a2fbf331d1c364bca6bbca0741d00f3e82265df.zip | |
add patch to fix device mapper naming in libblkide2fsprogs-1_39-3
| -rw-r--r-- | e2fsprogs-1.39-blkid-devname.patch | 11 | ||||
| -rw-r--r-- | e2fsprogs.spec | 10 |
2 files changed, 19 insertions, 2 deletions
diff --git a/e2fsprogs-1.39-blkid-devname.patch b/e2fsprogs-1.39-blkid-devname.patch new file mode 100644 index 0000000..c8c4985 --- /dev/null +++ b/e2fsprogs-1.39-blkid-devname.patch @@ -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; + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 729d616..19ee02d 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -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 @@ Patch32: e2fsprogs-1.38-no_pottcdate.patch 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 @@ also want to install e2fsprogs. %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 @@ exit 0 %{_mandir}/man3/uuid_unparse.3* %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 * Mon Jul 10 2006 Karel Zak <kzak@redhat.com> - 1.39-2 |