[packages/gdisk] - added link patch (fixes build with -Wl,--no-copy-dt-needed-entries) - avoid disabling Unicode supp

[qboosh]

commit cae4a82d3f3757ae38d1d08bbe0e2a47bf6a24af
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Apr 12 15:17:33 2013 +0200

    - added link patch (fixes build with -Wl,--no-copy-dt-needed-entries)
    - avoid disabling Unicode support
    - pl

 gdisk-link.patch | 30 ++++++++++++++++++++++++++++++
 gdisk.spec       | 21 ++++++++++++++++-----
 2 files changed, 46 insertions(+), 5 deletions(-)
---
diff --git a/gdisk.spec b/gdisk.spec
index 7c709d6..0ba52b9 100644
--- a/gdisk.spec
+++ b/gdisk.spec
@@ -1,4 +1,5 @@
 Summary:	An fdisk-like partitioning tool for GPT disks
+Summary(pl.UTF-8):	Podobne do fdiska narzędzie do partycjonowania dysków GPT
 Name:		gdisk
 Version:	0.8.6
 Release:	1
@@ -6,6 +7,7 @@ License:	GPL v2
 Group:		Base
 Source0:	http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz
 # Source0-md5:	f5ec6647d3de43644ad7e99b34f74982
+Patch0:		%{name}-link.patch
 URL:		http://www.rodsbooks.com/gdisk/
 BuildRequires:	libicu-devel
 BuildRequires:	libstdc++-devel
@@ -15,18 +17,27 @@ BuildRequires:	popt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-An fdisk-like partitioning tool for GPT disks. GPT fdisk features a
-command-line interface, fairly direct manipulation of partition table
-structures, recovery tools to help you deal with corrupt partition
-tables, and the ability to convert MBR disks to GPT format.
+GPT fdisk (gdisk) is an fdisk-like partitioning tool for GPT disks.
+It features a command-line interface, fairly direct manipulation of
+partition table structures, recovery tools to help you deal with
+corrupt partition tables, and the ability to convert MBR disks to GPT
+format.
+
+%description -l pl.UTF-8
+GPT fdisk (gdisk) to podobne do fdiska narzędzie do partycjonowania
+dysków GPT. Ma interfejs linii poleceń, w miarę bezpośrednie operacje
+na strukturach tablicy partycji, narzędzia pomagające przy naprawie
+uszkodzonych tablic partycji oraz możliwość konwersji dysków MBR do
+formatu GPT.
 
 %prep
 %setup -q -n gptfdisk-%{version}
+%patch0 -p1
 
 %build
 %{__make} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64 -I/usr/include/ncurses"
+	CXXFLAGS="%{rpmcxxflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64 -DUSE_UTF16 -I/usr/include/ncurses"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/gdisk-link.patch b/gdisk-link.patch
new file mode 100644
index 0000000..feacfe8
--- /dev/null
+++ b/gdisk-link.patch
@@ -0,0 +1,30 @@
+--- gptfdisk-0.8.6/Makefile.orig	2013-01-09 17:09:33.000000000 +0100
++++ gptfdisk-0.8.6/Makefile	2013-04-11 21:43:11.686245775 +0200
+@@ -1,7 +1,7 @@
+ CC=gcc
+ CXX=g++
+ CFLAGS+=-D_FILE_OFFSET_BITS=64
+-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -DUSE_UTF16
+ #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
+ LDFLAGS+=
+ LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
+@@ -15,15 +15,15 @@
+ 
+ gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
+ #	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
+-	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
++	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -pthread -o gdisk
+ 
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+ #	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
+-	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
++	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -pthread -o cgdisk
+ 
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+ #	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
+-	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
++	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -pthread -o sgdisk
+ 
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+ 	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdisk.git/commitdiff/cae4a82d3f3757ae38d1d08bbe0e2a47bf6a24af