Group :: System/Base
RPM: util-linux
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: util-linux-2.12r-alt-tinfo.patch
Download
Download
diff -upk.orig util-linux-2.12r.orig/configure util-linux-2.12r/configure
--- util-linux-2.12r.orig/configure 2004-12-20 22:20:35 +0000
+++ util-linux-2.12r/configure 2006-03-07 16:41:06 +0000
@@ -457,14 +457,14 @@ echo '
#include <termcap.h>
int main(){ exit(0); tgetnum("li"); }
' > conftest.c
-LIBS=-ltermcap
+LIBS=-ltinfo
eval $compile
LIBS=
if test -s conftest; then
echo "#define HAVE_termcap" >> defines.h
echo "HAVE_TERMCAP=yes" >> make_include
- echo "LIBTERMCAP=-ltermcap" >> make_include
- echo "You have termcap"
+ echo "LIBTERMCAP=-ltinfo" >> make_include
+ echo "You have tinfo"
else
echo "HAVE_TERMCAP=no" >> make_include
if [ $have_ncurses = 0 ]; then
diff -upk.orig util-linux-2.12r.orig/misc-utils/Makefile util-linux-2.12r/misc-utils/Makefile
--- util-linux-2.12r.orig/misc-utils/Makefile 2006-03-07 16:40:34 +0000
+++ util-linux-2.12r/misc-utils/Makefile 2006-03-07 16:41:47 +0000
@@ -58,14 +58,14 @@ all: $(BIN) $(USRBIN) $(USRBIN.NONSHADOW
$(NEEDS_CURSES):
ifeq "$(HAVE_NCURSES)" "yes"
- $(CC) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
+ $(CC) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP)
else
@echo $@ not made since it requires ncurses
endif
ifeq "$(HAVE_NCURSES)" "yes"
cal:
- $(CC) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
+ $(CC) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP)
else
ifeq "$(HAVE_TERMCAP)" "yes"
cal:
diff -upk.orig util-linux-2.12r.orig/text-utils/Makefile util-linux-2.12r/text-utils/Makefile
--- util-linux-2.12r.orig/text-utils/Makefile 2006-03-07 16:40:34 +0000
+++ util-linux-2.12r/text-utils/Makefile 2006-03-07 16:41:06 +0000
@@ -36,7 +36,7 @@ all: $(BIN) $(USRBIN)
ifeq "$(HAVE_NCURSES)" "yes"
# Have ncurses - make more and pg and ul
pg ul:
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP)
pg: pg.o
ul: ul.o
else