- Always define PED_DEVICE_DM regardless of compile time options

This commit is contained in:
David Cantrell 2007-10-04 19:52:24 +00:00
parent bfb0b7fdca
commit 2b24ccacbd
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff -up parted-1.8.6/include/parted/device.h.devmapper parted-1.8.6/include/parted/device.h
--- parted-1.8.6/include/parted/device.h.devmapper 2007-10-04 15:39:27.000000000 -0400
+++ parted-1.8.6/include/parted/device.h 2007-10-04 15:40:11.000000000 -0400
@@ -46,9 +46,7 @@ typedef enum {
PED_DEVICE_DASD = 9,
PED_DEVICE_VIODASD = 10,
PED_DEVICE_SX8 = 11,
-#ifdef ENABLE_DEVICE_MAPPER
PED_DEVICE_DM = 12,
-#endif
PED_DEVICE_XVD = 13
} PedDeviceType;

View File

@ -4,7 +4,7 @@
Summary: The GNU disk partition manipulation program Summary: The GNU disk partition manipulation program
Name: parted Name: parted
Version: 1.8.6 Version: 1.8.6
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://www.gnu.org/software/parted URL: http://www.gnu.org/software/parted
@ -15,6 +15,7 @@ Patch1: %{name}-1.8.6-notransname.patch
Patch2: %{name}-1.8.6-off-by-one.patch Patch2: %{name}-1.8.6-off-by-one.patch
Patch3: %{name}-1.8.6-primary-boundary.patch Patch3: %{name}-1.8.6-primary-boundary.patch
Patch4: %{name}-1.8.6-xvd.patch Patch4: %{name}-1.8.6-xvd.patch
Patch5: %{name}-1.8.6-devmapper-header.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: e2fsprogs-devel readline-devel ncurses-devel BuildRequires: e2fsprogs-devel readline-devel ncurses-devel
@ -49,6 +50,7 @@ Parted library, you need to install this package.
%patch2 -p1 -b .offbyone %patch2 -p1 -b .offbyone
%patch3 -p1 -b .boundary %patch3 -p1 -b .boundary
%patch4 -p1 -b .xvd %patch4 -p1 -b .xvd
%patch5 -p1 -b .devmapper
%build %build
%configure --enable-device-mapper --enable-selinux --disable-static %configure --enable-device-mapper --enable-selinux --disable-static
@ -93,6 +95,9 @@ fi
%{_libdir}/pkgconfig/libparted.pc %{_libdir}/pkgconfig/libparted.pc
%changelog %changelog
* Thu Oct 04 2007 David Cantrell <dcantrell@redhat.com> - 1.8.6-9
- Always define PED_DEVICE_DM regardless of compile time options
* Tue Aug 21 2007 David Cantrell <dcantrell@redhat.com> - 1.8.6-8 * Tue Aug 21 2007 David Cantrell <dcantrell@redhat.com> - 1.8.6-8
- Rebuild - Rebuild