3
0
forked from pool/util-linux

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
This commit is contained in:
Stephan Kulow 2011-11-22 16:49:53 +00:00 committed by Git OBS Bridge
commit ce6eaddccd
3 changed files with 26 additions and 0 deletions

18
fdisk-tinfo.patch Normal file
View File

@ -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

View File

@ -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 Tue Nov 15 13:15:19 UTC 2011 - coolo@suse.com

View File

@ -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 Patch7: fsck-use-FS-blacklist-for-non-all-mode-too.patch
Patch8: libmount-ignore-tailing-slash-in-netfs-source-paths.patch Patch8: libmount-ignore-tailing-slash-in-netfs-source-paths.patch
Patch9: libmount-fix-chdir-to-parent-for-restricted-user-umo.patch Patch9: libmount-fix-chdir-to-parent-for-restricted-user-umo.patch
Patch10: fdisk-tinfo.patch
## ##
## adjtimex ## adjtimex
@ -109,6 +110,7 @@ Patch60: time-1.7.dif
## which ## which
## ##
Patch70: which-lib64.patch Patch70: which-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq /bin/sed PreReq: %insserv_prereq %fillup_prereq /bin/sed
# #
@ -198,6 +200,7 @@ Files to develop applications using the libmount library.
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
# #
cd adjtimex-* cd adjtimex-*