rpms/parted/devel parted-1.7.1-O_DIRECT.patch, 1.1, 1.2 parted.spec, 1.75, 1.76

[fedora-cvs-commits at redhat.com]

Author: dcantrel

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

Modified Files:
	parted-1.7.1-O_DIRECT.patch parted.spec 
Log Message:
- PED_SECTOR_SIZE -> PED_SECTOR_SIZE_DEFAULT (whoops)


parted-1.7.1-O_DIRECT.patch:
 linux.c |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

Index: parted-1.7.1-O_DIRECT.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.7.1-O_DIRECT.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parted-1.7.1-O_DIRECT.patch	22 Jun 2006 18:26:53 -0000	1.1
+++ parted-1.7.1-O_DIRECT.patch	22 Jun 2006 18:35:07 -0000	1.2
@@ -1,6 +1,5 @@
-diff -urN parted-1.7.1.orig/libparted/arch/linux.c parted-1.7.1/libparted/arch/linux.c
---- parted-1.7.1.orig/libparted/arch/linux.c	2006-06-22 14:18:31.000000000 -0400
-+++ parted-1.7.1/libparted/arch/linux.c	2006-06-22 14:24:59.000000000 -0400
+--- parted-1.7.1/libparted/arch/linux.c.o_direct	2006-06-22 14:31:38.000000000 -0400
++++ parted-1.7.1/libparted/arch/linux.c	2006-06-22 14:32:59.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <libgen.h>
  #include <stdint.h>
@@ -44,7 +43,7 @@
                  }
          }
  
-+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
++        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
 +                return 0;
          while (1) {
 -                status = read (arch_specific->fd, buffer, read_length);
@@ -87,9 +86,9 @@
                  dev->path, buffer, (int) start, (int) count);
  #else
          dev->dirty = 1;
-+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
++        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
 +                return 0;
-+        memcpy(diobuf, buffer, count * PED_SECTOR_SIZE);
++        memcpy(diobuf, buffer, count * PED_SECTOR_SIZE_DEFAULT);
 +        diobuf_start = diobuf;
          while (1) {
 -                status = write (arch_specific->fd, buffer, write_length);
@@ -133,7 +132,7 @@
          if (!_device_seek (dev, start))
                  return 0;
  
-+        if (posix_memalign(&diobuf, PED_SECTOR_SIZE, count * PED_SECTOR_SIZE) != 0)
++        if (posix_memalign(&diobuf, PED_SECTOR_SIZE_DEFAULT, count * PED_SECTOR_SIZE_DEFAULT) != 0)
 +                return 0;
 +
          for (done = 0; done < count; done += status / dev->sector_size) {


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- parted.spec	22 Jun 2006 18:26:53 -0000	1.75
+++ parted.spec	22 Jun 2006 18:35:07 -0000	1.76
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 6
+Release: 7
 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
@@ -100,6 +100,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-7
+- PED_SECTOR_SIZE -> PED_SECTOR_SIZE_DEFAULT
+
 * Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-6
 - Roll dasd patches together
 - Use O_DIRECT to prevent first partition corruption on GPT disks