From 19cd527b151ec518ae72b6566efc1a882b2f79d8 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Fri, 13 Apr 2007 15:23:49 +0000
Subject: [PATCH] - Fix primary partition cylinder alignment error for DOS disk
 labels     (#229745) - Do not build and package up libparted.a, only the
 shared library

---
 parted-1.8.6-primary-boundary.patch | 12 ++++++++++++
 parted.spec                         | 11 ++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 parted-1.8.6-primary-boundary.patch

diff --git a/parted-1.8.6-primary-boundary.patch b/parted-1.8.6-primary-boundary.patch
new file mode 100644
index 0000000..0366977
--- /dev/null
+++ b/parted-1.8.6-primary-boundary.patch
@@ -0,0 +1,12 @@
+--- parted-1.8.6/libparted/labels/dos.c.boundary	2007-03-13 13:01:09.000000000 -0400
++++ parted-1.8.6/libparted/labels/dos.c	2007-04-11 14:56:54.000000000 -0400
+@@ -1696,8 +1696,7 @@
+ 					 _primary_start_constraint (disk, part,
+ 						 bios_geom, min_geom)));
+ 
+-	if (!solution)
+-		solution = _best_solution (part, bios_geom, solution,
++	solution = _best_solution (part, bios_geom, solution,
+ 			_try_constraint (part, constraint,
+ 				_primary_constraint (disk, bios_geom,
+ 				min_geom)));
diff --git a/parted.spec b/parted.spec
index 0186d01..15bd305 100644
--- a/parted.spec
+++ b/parted.spec
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.8.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:   Applications/System
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@ Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: %{name}-1.8.6-warnings.patch
 Patch1: %{name}-1.8.6-notransname.patch
 Patch2: %{name}-1.8.6-off-by-one.patch
+Patch3: %{name}-1.8.6-primary-boundary.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel readline-devel ncurses-devel
@@ -44,9 +45,10 @@ Parted library, you need to install this package.
 %patch0 -p1 -b .warnings
 %patch1 -p1 -b .notransname
 %patch2 -p1 -b .offbyone
+%patch3 -p1 -b .boundary
 
 %build
-%configure --enable-device-mapper --enable-selinux
+%configure --enable-device-mapper --enable-selinux --disable-static
 %{__make} %{?_smp_mflags}
 
 %install
@@ -85,11 +87,14 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/parted
-%{_libdir}/libparted.a
 %{_libdir}/libparted.so
 %{_libdir}/pkgconfig/libparted.pc
 
 %changelog
+* Fri Apr 13 2007 David Cantrell <dcantrell@redhat.com> - 1.8.6-4
+- Fix primary partition cylinder alignment error for DOS disk labels (#229745)
+- Do not build and package up libparted.a, only the shared library
+
 * Wed Apr 11 2007 David Cantrell <dcantrell@redhat.com> - 1.8.6-3
 - Fix off-by-one bug in parted(8) when displaying disk label (#235901)