Hello community, here is the log from the commit of package pinfo for openSUSE:Factory checked in at 2011-11-28 12:55:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pinfo (Old) and /work/SRC/openSUSE:Factory/.pinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pinfo", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pinfo/pinfo.changes 2011-11-25 23:05:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pinfo.new/pinfo.changes 2011-11-28 12:55:51.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 25 15:28:30 UTC 2011 - [email protected] + +- Help the configure scripot a bit with tinfo from new ncurses API + +------------------------------------------------------------------- New: ---- pinfo-0.6.10-tinfo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinfo.spec ++++++ --- /var/tmp/diff_new_pack.e39zWq/_old 2011-11-28 12:55:52.000000000 +0100 +++ /var/tmp/diff_new_pack.e39zWq/_new 2011-11-28 12:55:52.000000000 +0100 @@ -27,6 +27,7 @@ Release: 2 Source: %{name}-%{version}.tar.bz2 Patch1: pinfo-0.6.9-nul-strings.patch +Patch2: pinfo-0.6.10-tinfo.patch Url: https://alioth.debian.org/projects/pinfo/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Lynx-style Info Browser @@ -44,6 +45,7 @@ %prep %setup %patch1 +%patch2 %build # This package failed when testing with -Wl,-as-needed being default. ++++++ pinfo-0.6.10-tinfo.patch ++++++ --- macros/curses.m4 +++ macros/curses.m4 2011-11-25 15:20:33.555146338 +0000 @@ -175,27 +175,38 @@ dnl AC_DEFUN([AC_SEARCH_CURSES_H], [ AC_MSG_CHECKING([location of curses.h file]) + lib_path=$(LC_ALL=C $CC -print-search-dirs 2>/dev/null | sed -n -e 's,^libraries:[[:blank:]]*=,,p') stop_searching=false found_curses_h=false + cf_stdscr="" + cf_lib="lib" + + case ":${lib_path}:" in + *:/*/lib64/*:) + cf_lib="lib64" ;; + esac + for lib in tinfo terminfo ncurses ncursesw ; do + AC_CHECK_LIB($lib, stdscr, [cf_stdscr="-l$lib"; break]) + done dnl if a particular location was specified if test "x$curses_location" != "xfalse" then dnl check this particular location AC_SEARCH_CURSES_FILE($curses_location/include, ncursesw/ncurses.h, - -L$curses_location/lib -lncursesw, + -L$curses_location/$cf_lib -lncursesw $cf_stdscr, -I$curses_location/include ) AC_SEARCH_CURSES_FILE($curses_location/include, ncursesw.h, - -L$curses_location/lib -lncursesw, + -L$curses_location/$cf_lib -lncursesw $cf_stdscr, -I$curses_location/include ) AC_SEARCH_CURSES_FILE($curses_location/include, ncurses/ncurses.h, - -L$curses_location/lib -lncurses, + -L$curses_location/$cf_lib -lncurses $cf_stdscr, -I$curses_location/include ) AC_SEARCH_CURSES_FILE($curses_location/include, ncurses.h, - -L$curses_location/lib -lncurses, + -L$curses_location/$cf_lib -lncurses $cf_stdscr, -I$curses_location/include ) AC_SEARCH_CURSES_FILE($curses_location/include, curses.h, - -L$curses_location/lib -lncurses, + -L$curses_location/$cf_lib -lncurses $cf_stdscr, -I$curses_location/include ) else @@ -203,47 +216,47 @@ AC_DEFUN([AC_SEARCH_CURSES_H], [ dnl first preference is ncursesw AC_SEARCH_CURSES_FILE(/usr/local/include, ncursesw/ncurses.h, - -L/usr/local/lib -lncursesw, + -L/usr/local/$cf_lib -lncursesw, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/local/include/, ncursesw.h, - -L/usr/local/lib -lncursesw, + -L/usr/local/$cf_lib -lncursesw, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/include, ncursesw/ncurses.h, - -L/usr/lib -lncursesw, + -L/usr/$cf_lib -lncursesw, -I/usr/include ) AC_SEARCH_CURSES_FILE(/usr/include/, ncursesw.h, - -L/usr/lib -lncursesw, + -L/usr/$cf_lib -lncursesw, -I/usr/include ) dnl after that, look for normal ncurses AC_SEARCH_CURSES_FILE(/usr/local/include, ncurses.h, - -L/usr/local/lib -lncurses, + -L/usr/local/$cf_lib -lncurses, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/local/include, ncurses/ncurses.h, - -L/usr/local/lib -lncurses, + -L/usr/local/$cf_lib -lncurses, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/include, ncurses.h, - -L/usr/lib -lncurses, + -L/usr/$cf_lib -lncurses, -I/usr/include ) AC_SEARCH_CURSES_FILE(/usr/include, ncurses/ncurses.h, - -L/usr/lib -lncurses, + -L/usr/$cf_lib -lncurses, -I/usr/include ) dnl after that, look for curses AC_SEARCH_CURSES_FILE(/usr/local/include, curses.h, - -L/usr/local/lib -lncurses, + -L/usr/local/$cf_lib -lncurses, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/local/include, curses/curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include ) AC_SEARCH_CURSES_FILE(/usr/include, curses.h, - -L/usr/lib -lncurses, + -L/usr/$cf_lib -lncurses, -I/usr/include ) AC_SEARCH_CURSES_FILE(/usr/include, curses/curses.h, - -L/usr/lib -lncurses, + -L/usr/$cf_lib -lncurses, -I/usr/include ) fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
