rpms/parted/devel parted-1.6.22-mac-parts.patch, NONE, 1.1 parted.spec, 1.48, 1.49

[fedora-cvs-commits at redhat.com]

Author: clumens

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

Modified Files:
	parted.spec 
Added Files:
	parted-1.6.22-mac-parts.patch 
Log Message:
Added upstream patch to display certain Apple_Free partitions (#154479).


parted-1.6.22-mac-parts.patch:
 disk_mac.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE parted-1.6.22-mac-parts.patch ---
--- parted-1.6.22/libparted/disk_mac.c	27 Mar 2005 10:46:45 -0000	1.7
+++ parted-1.6.22/libparted/disk_mac.c	20 Apr 2005 13:38:44 -0000	1.8
@@ -357,7 +357,13 @@
 static int
 _rawpart_cmp_type (MacRawPartition* raw_part, char* type)
 {
-	return strcasecmp (raw_part->type, type) == 0;
+	return strncasecmp (raw_part->type, type, 32) == 0;
+}
+
+static int
+_rawpart_cmp_name (MacRawPartition* raw_part, char* name)
+{
+	return strncasecmp (raw_part->name, name, 32) == 0;
 }
 
 static int
@@ -447,9 +453,10 @@
 static int
 _rawpart_is_active (MacRawPartition* raw_part)
 {
-	if (_rawpart_cmp_type (raw_part, "Apple_Void"))
+	if (_rawpart_cmp_type (raw_part, "Apple_Free")
+	    && _rawpart_cmp_name (raw_part, "Extra"))
 		return 0;
-	if (_rawpart_cmp_type (raw_part, "Apple_Free"))
+	if (_rawpart_cmp_type (raw_part, "Apple_Void"))
 		return 0;
 	if (_rawpart_cmp_type (raw_part, "Apple_Scratch"))
 		return 0;


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- parted.spec	23 Mar 2005 15:39:41 -0000	1.48
+++ parted.spec	5 May 2005 14:13:41 -0000	1.49
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.6.22
-Release: 1
+Release: 2
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.19-sx8.patch
@@ -14,6 +14,7 @@
 Patch151: parted-1.6.3-aix.patch
 Patch152: parted-1.6.15-dasd_geometry.patch
 Patch153: parted-1.6.22-mac-lvm.patch
+Patch154: parted-1.6.22-mac-parts.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -51,6 +52,7 @@
 %patch151 -p1 -b .aix
 %patch152 -p1 -b .dasd_geometry
 %patch153 -p1 -b .mac-lvm
+%patch154 -p1 -b .mac-parts
 
 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
@@ -99,6 +101,9 @@
 %{_libdir}/*.a*
 
 %changelog
+* Thu May 05 2005 Chris Lumens <clumens at redhat.com> 1.6.22-2
+- Added upstream patch to display certain Apple_Free partitions (#154479).
+
 * Wed Mar 23 2005 Chris Lumens <clumens at redhat.com> 1.6.22-1
 - Updated to 1.6.22.
 - Get rid of separate gc4 patch that's now included upstream.