From cbfe7fd1d37de3e94b53bc6f691f2cf87ea2781ed832625295a2af9080e00875 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 14 Sep 2007 14:28:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=30 --- util-linux-2.13-fdisk_cfdisk_ncursesw.patch | 13 +++++++++++++ util-linux.changes | 6 ++++++ util-linux.spec | 12 ++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 util-linux-2.13-fdisk_cfdisk_ncursesw.patch diff --git a/util-linux-2.13-fdisk_cfdisk_ncursesw.patch b/util-linux-2.13-fdisk_cfdisk_ncursesw.patch new file mode 100644 index 0000000..20f3226 --- /dev/null +++ b/util-linux-2.13-fdisk_cfdisk_ncursesw.patch @@ -0,0 +1,13 @@ +Index: util-linux-ng-2.13rc2+git20070725/fdisk/Makefile.am +=================================================================== +--- util-linux-ng-2.13rc2+git20070725.orig/fdisk/Makefile.am ++++ util-linux-ng-2.13rc2+git20070725/fdisk/Makefile.am +@@ -29,7 +29,7 @@ if HAVE_NCURSES + sbin_PROGRAMS += cfdisk + man_MANS += cfdisk.8 + cfdisk_SOURCES = cfdisk.c $(fdisk_common) +-cfdisk_LDADD = -lncurses ++cfdisk_LDADD = -lncursesw + endif + endif + diff --git a/util-linux.changes b/util-linux.changes index 4896993..aa643f9 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 14 11:24:33 CEST 2007 - mkoenig@suse.de + +- link cfdisk against libncursesw instead libncurses to fix + broken utf-8 characters [#307353] + ------------------------------------------------------------------- Wed Aug 29 12:22:21 CEST 2007 - mkoenig@suse.de diff --git a/util-linux.spec b/util-linux.spec index 7e1c81c..1b05cdc 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -12,16 +12,16 @@ Name: util-linux BuildRequires: audit-devel gettext-devel libuuid-devel libvolume_id-devel ncurses-devel pam-devel zlib-devel -URL: http://kernel.org/pub/linux/utils/util-linux +Url: http://kernel.org/pub/linux/utils/util-linux Provides: util rawio raw base schedutils Supplements: filesystem(minix) Obsoletes: util rawio raw base schedutils PreReq: %install_info_prereq permissions License: BSD 3-Clause, GPL v2 or later Group: System/Base -Autoreqprov: on +AutoReqProv: on Version: 2.12r+2.13rc2+git20070725 -Release: 16 +Release: 21 %define upver 2.13rc2+git20070725 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%upver.tar.bz2 @@ -74,6 +74,7 @@ Patch9: util-linux-2.13-schedutils_error_handling.patch # 304861 - support password hashing and key length Patch10: cryptsetup-2.13-crypto.diff Patch11: util-linux-2.13-mount_fd_leak.patch +Patch12: util-linux-2.13-fdisk_cfdisk_ncursesw.patch ## ## ## adjtimex @@ -120,6 +121,7 @@ Authors: %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 # cd adjtimex-* %patch50 -p1 @@ -330,7 +332,6 @@ fi %install_info_delete --info-dir=%{_infodir} %{_infodir}/time.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/which.info.gz %{insserv_cleanup} - %verifyscript %verify_permissions -e /usr/bin/wall -e /usr/bin/write @@ -560,6 +561,9 @@ fi #%endif %changelog +* Fri Sep 14 2007 - mkoenig@suse.de +- link cfdisk against libncursesw instead libncurses to fix + broken utf-8 characters [#307353] * Wed Aug 29 2007 - mkoenig@suse.de - fix fd leaks in previous patch * Tue Aug 28 2007 - lnussel@suse.de