[gdisk/el5: 3/3] Merge 0.8.2 from el6

[Orion Poplawski]

commit d7c0c5d49eb2ef36d09ad32cf3e762f23b1a3e8f
Merge: 0d81e7d 49f26e4
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jan 30 08:56:52 2012 -0700

    Merge 0.8.2 from el6

 .gitignore                 |    1 +
 gdisk.spec                 |   12 ++++++++++--
 gptfdisk-0.8.1-gcc47.patch |   11 +++++++++++
 sources                    |    2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)
---
diff --cc gdisk.spec
index 589960e,266dc7b..82014d8
--- 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
+ Patch0:        gptfdisk-0.8.1-gcc47.patch
 -BuildRequires: popt-devel
  BuildRequires: libicu-devel
 -BuildRequires: libuuid-devel
 +BuildRequires: e2fsprogs-devel
  BuildRequires: ncurses-devel
  BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  %description