[gdisk/el5: 5/5] Merge from master

[Orion Poplawski]

commit 0d81e7d50f1ca82124cb75a3c662e1bbf6e7a1e9
Merge: e37d5e2 5c6d38f
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 17 14:30:14 2011 -0600

    Merge from master

 .gitignore |    1 +
 gdisk.spec |   30 +++++++++++++++++++++++-------
 sources    |    2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)
---
diff --cc gdisk.spec
index bc8647a,69b20d6..589960e
--- a/gdisk.spec
+++ b/gdisk.spec
@@@ -6,9 -6,10 +6,10 @@@ License:       GPLv
  URL:           http://www.rodsbooks.com/gdisk/
  Group:         System Environment/Base
  Source0:       http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz
 -BuildRequires: popt-devel
 +BuildRequires: popt
  BuildRequires: libicu-devel
 -BuildRequires: libuuid-devel
 +BuildRequires: e2fsprogs-devel
+ BuildRequires: ncurses-devel
  BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  %description
  An fdisk-like partitioning tool for GPT disks. GPT fdisk features a