rpms/parted/FC-5 parted-1.7.1-apple_boot.patch, NONE, 1.1 parted.spec, 1.67, 1.68

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/parted/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25463

Modified Files:
	parted.spec 
Added Files:
	parted-1.7.1-apple_boot.patch 
Log Message:
- Detect Apple_Boot partition types correctly (#204714)


parted-1.7.1-apple_boot.patch:
 mac.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE parted-1.7.1-apple_boot.patch ---
--- parted-1.7.1/libparted/labels/mac.c.apple_boot	2006-05-25 13:28:55.000000000 -0400
+++ parted-1.7.1/libparted/labels/mac.c	2006-11-02 17:57:03.000000000 -0500
@@ -407,7 +407,13 @@
 static int
 _rawpart_is_boot (MacRawPartition* raw_part)
 {
-	return !strcasecmp (raw_part->type, "Apple_Bootstrap");
+	if (!strcasecmp(raw_part->type, "Apple_Bootstrap"))
+		return 1;
+
+	if (!strcasecmp(raw_part->type, "Apple_Boot"))
+		return 1;
+
+	return 0;
 }
 
 static int
@@ -604,7 +610,8 @@
 				goto error_destroy_part;
 		}
 	} else {
-		if (mac_part_data->data_region_length < part->geom.length) {
+		if (mac_part_data->data_region_length < part->geom.length &&
+		    !mac_part_data->is_boot) {
 			if (ped_exception_throw (
 				PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_IGNORE_CANCEL,


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/FC-5/parted.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- parted.spec	30 Aug 2006 15:12:43 -0000	1.67
+++ parted.spec	2 Nov 2006 23:18:26 -0000	1.68
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name:    parted
 Version: 1.7.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0:  parted-1.7.0-fat.c.patch
 Patch1:  parted-1.7.0-sx8.patch
@@ -17,6 +17,7 @@
 Patch9:  parted-1.7.1-get_exception.patch
 Patch10: parted-1.7.1-gpt.patch
 Patch11: parted-1.7.1-constraint.patch
+Patch12: parted-1.7.1-apple_boot.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -57,6 +58,7 @@
 %patch9 -p1 -b .get_exception
 %patch10 -p1 -b .gpt
 %patch11 -p1 -b .constraint
+%patch12 -p1 -b .apple_boot
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -110,6 +112,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Nov 02 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-17
+- Detect Apple_Boot partition types correctly (#204714)
+
 * Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-16
 - Fixed include/parted/device.h header file (needs constraint.h)