From e3381747e8e326aac0a67d2e03bd8d06b7ffb112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=F8sten?= <terje.rosten@ntnu.no>
Date: Mon, 11 Apr 2011 11:12:12 +0200
Subject: [PATCH] 0.7.1

---
 .gitignore               |  1 +
 gdisk.spec               | 17 ++++++++++++-----
 gptfdisk-0.7.1-dso.patch | 15 +++++++++++++++
 sources                  |  2 +-
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 gptfdisk-0.7.1-dso.patch

diff --git a/.gitignore b/.gitignore
index 1db700d..ca62d47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gdisk-0.6.8.tgz
 /gdisk-0.6.13.tgz
 /gdisk-0.6.14.tgz
+/gptfdisk-0.7.1.tgz
diff --git a/gdisk.spec b/gdisk.spec
index d8c1ac4..0c1b326 100644
--- a/gdisk.spec
+++ b/gdisk.spec
@@ -1,12 +1,15 @@
 Summary:       An fdisk-like partitioning tool for GPT disks
 Name:          gdisk
-Version:       0.6.14
-Release:       2%{?dist}
+Version:       0.7.1
+Release:       1%{?dist}
 License:       GPLv2
 URL:           http://www.rodsbooks.com/gdisk/
 Group:         System Environment/Base
-Source0:       http://downloads.sourceforge.net/gptfdisk/gdisk-%{version}.tgz
-BuildRequires: popt-devel libuuid-devel
+Source0:       http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tgz
+Patch0:        gptfdisk-0.7.1-dso.patch
+BuildRequires: popt-devel
+BuildRequires: libicu-devel
+BuildRequires: libuuid-devel
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %description
 An fdisk-like partitioning tool for GPT disks. GPT fdisk features a
@@ -15,7 +18,8 @@ structures, recovery tools to help you deal with corrupt partition
 tables, and the ability to convert MBR disks to GPT format.
 
 %prep
-%setup -q
+%setup -q -n gptfdisk-%{version}
+%patch0 -p1
 
 %build
 %{__make} CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
@@ -39,6 +43,9 @@ tables, and the ability to convert MBR disks to GPT format.
 %{_mandir}/man8/sgdisk.8*
 
 %changelog
+* Mon Apr 12 2011 Terje Rosten <terje.rosten@ntnu.no> - 0.7.1-1
+- 0.7.1
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/gptfdisk-0.7.1-dso.patch b/gptfdisk-0.7.1-dso.patch
new file mode 100644
index 0000000..8d414b2
--- /dev/null
+++ b/gptfdisk-0.7.1-dso.patch
@@ -0,0 +1,15 @@
+--- gptfdisk-0.7.1/Makefile.orig	2011-04-11 11:01:15.000000000 +0200
++++ gptfdisk-0.7.1/Makefile	2011-04-11 11:05:40.000000000 +0200
+@@ -14,10 +14,10 @@
+ all:	gdisk sgdisk fixparts
+ 
+ gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
+-	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -luuid -o gdisk
++	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
+ 
+ sgdisk: $(LIB_OBJS) sgdisk.o
+-	$(CXX) $(LIB_OBJS) sgdisk.o $(LDFLAGS) -licuio -luuid -lpopt -o sgdisk
++	$(CXX) $(LIB_OBJS) sgdisk.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
+ 
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+ 	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff --git a/sources b/sources
index 6a140a3..bb437e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ee90e610a47c5966044cb5541173276  gdisk-0.6.14.tgz
+7c8d810df61e81c821bef399b832e89e  gptfdisk-0.7.1.tgz