From 701e537f3bb8f634fe2ae5ccb14d66889b7d99f6f7f8a821b4fdacdc56c0ad32 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 22 Nov 2011 16:49:53 +0000 Subject: [PATCH] Accepting request 92907 from Base:System - add fdisk-tinfo.patch to fix build with newer curses. (forwarded request 92886 from a_jaeger) OBS-URL: https://build.opensuse.org/request/show/92907 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=140 --- fdisk-tinfo.patch | 18 ++++++++++++++++++ util-linux.changes | 5 +++++ util-linux.spec | 3 +++ 3 files changed, 26 insertions(+) create mode 100644 fdisk-tinfo.patch diff --git a/fdisk-tinfo.patch b/fdisk-tinfo.patch new file mode 100644 index 0000000..4735d18 --- /dev/null +++ b/fdisk-tinfo.patch @@ -0,0 +1,18 @@ +Index: util-linux-2.20.1/fdisk/Makefile.am +=================================================================== +--- util-linux-2.20.1.orig/fdisk/Makefile.am ++++ util-linux-2.20.1/fdisk/Makefile.am +@@ -64,9 +64,13 @@ sbin_PROGRAMS += cfdisk + dist_man_MANS += cfdisk.8 + cfdisk_SOURCES = cfdisk.c $(fdisk_common) + cfdisk_CFLAGS = $(cflags_blkid) ++if HAVE_TINFO ++cfdisk_LDADD = -ltinfo @NCURSES_LIBS@ $(ldadd_blkid) ++else + cfdisk_LDADD = @NCURSES_LIBS@ $(ldadd_blkid) + endif + endif ++endif + + endif # !ARCH_SPARC + endif # !ARCH_M68K diff --git a/util-linux.changes b/util-linux.changes index 27f5163..51a0664 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 21 15:13:56 UTC 2011 - aj@suse.de + +- add fdisk-tinfo.patch to fix build with newer curses. + ------------------------------------------------------------------- Tue Nov 15 13:15:19 UTC 2011 - coolo@suse.com diff --git a/util-linux.spec b/util-linux.spec index 6b3370f..4407d7a 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -92,6 +92,7 @@ Patch6: util-linux-dmesg-fix-printing-of-multibyte-characters.patch Patch7: fsck-use-FS-blacklist-for-non-all-mode-too.patch Patch8: libmount-ignore-tailing-slash-in-netfs-source-paths.patch Patch9: libmount-fix-chdir-to-parent-for-restricted-user-umo.patch +Patch10: fdisk-tinfo.patch ## ## adjtimex @@ -109,6 +110,7 @@ Patch60: time-1.7.dif ## which ## Patch70: which-lib64.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed # @@ -198,6 +200,7 @@ Files to develop applications using the libmount library. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # cd adjtimex-*