Hello community, here is the log from the commit of package pinfo checked in at Thu Jan 10 20:08:10 CET 2008. -------- --- pinfo/pinfo.changes 2007-05-29 14:43:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/pinfo/pinfo.changes 2008-01-10 17:53:21.257469000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 10 17:52:56 CET 2008 - mrueckert@suse.de + +- updated ncurses patch to stop it from looking for the wrong header + files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinfo.spec ++++++ --- /var/tmp/diff_new_pack.B31157/_old 2008-01-10 20:05:59.000000000 +0100 +++ /var/tmp/diff_new_pack.B31157/_new 2008-01-10 20:05:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pinfo (Version 0.6.9) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,15 +12,15 @@ Name: pinfo BuildRequires: ncurses-devel -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Publishing/Texinfo -Autoreqprov: on +AutoReqProv: on Version: 0.6.9 -Release: 1 +Release: 34 Source: %{name}-%{version}.tar.bz2 Patch1: %{name}-%{version}-nul-strings.patch Patch2: %{name}-%{version}-ncursesw.patch -URL: http://dione.cc/~pborys/software/pinfo/ +Url: http://dione.cc/~pborys/software/pinfo/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Lynx-style Info Browser PreReq: %install_info_prereq @@ -40,14 +40,8 @@ %patch2 %build -%define sysconfdir /etc -#autoreconf -fi -CFLAGS="$RPM_OPT_FLAGS" \ -CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --infodir=%{_infodir} \ - --sysconfdir=%{sysconfdir} +autoreconf -fi +%configure --with-curses=%{_prefix} make %install @@ -72,6 +66,9 @@ %{_prefix}/bin/pinfo %changelog +* Thu Jan 10 2008 - mrueckert@suse.de +- updated ncurses patch to stop it from looking for the wrong header + files * Tue May 29 2007 - anosek@suse.cz - updated to version 0.6.9 * Nodes containing a "." are now correctly found ++++++ pinfo-0.6.9-ncursesw.patch ++++++ --- /var/tmp/diff_new_pack.B31157/_old 2008-01-10 20:05:59.000000000 +0100 +++ /var/tmp/diff_new_pack.B31157/_new 2008-01-10 20:05:59.000000000 +0100 @@ -1,6 +1,8 @@ ---- configure -+++ configure -@@ -9904,7 +9904,7 @@ +Index: configure +=================================================================== +--- configure.orig 2006-03-16 17:27:26.000000000 +0100 ++++ configure 2008-01-10 17:45:26.345205888 +0100 +@@ -9904,7 +9904,7 @@ echo "${ECHO_T}$curses_location/include/ echo "$as_me:$LINENO: result: $curses_location/include/ncurses/ncurses.h" >&5 echo "${ECHO_T}$curses_location/include/ncurses/ncurses.h" >&6 curses_h="ncurses/ncurses.h" @@ -9,7 +11,7 @@ curses_includes="-I$curses_location/include " stop_searching=true found_curses_h=true -@@ -9919,7 +9919,7 @@ +@@ -9919,7 +9919,7 @@ echo "${ECHO_T}$curses_location/include/ echo "$as_me:$LINENO: result: $curses_location/include/ncurses.h" >&5 echo "${ECHO_T}$curses_location/include/ncurses.h" >&6 curses_h="ncurses.h" @@ -18,7 +20,7 @@ curses_includes="-I$curses_location/include " stop_searching=true found_curses_h=true -@@ -9934,7 +9934,7 @@ +@@ -9934,7 +9934,7 @@ echo "${ECHO_T}$curses_location/include/ echo "$as_me:$LINENO: result: $curses_location/include/curses.h" >&5 echo "${ECHO_T}$curses_location/include/curses.h" >&6 curses_h="curses.h" @@ -27,7 +29,7 @@ curses_includes="-I$curses_location/include " stop_searching=true found_curses_h=true -@@ -10014,7 +10014,7 @@ +@@ -10014,7 +10014,7 @@ echo "${ECHO_T}/usr/include//ncursesw.h" echo "$as_me:$LINENO: result: /usr/local/include/ncurses.h" >&5 echo "${ECHO_T}/usr/local/include/ncurses.h" >&6 curses_h="ncurses.h" @@ -36,7 +38,7 @@ curses_includes="-I/usr/local/include " stop_searching=true found_curses_h=true -@@ -10029,7 +10029,7 @@ +@@ -10029,7 +10029,7 @@ echo "${ECHO_T}/usr/local/include/ncurse echo "$as_me:$LINENO: result: /usr/local/include/ncurses/ncurses.h" >&5 echo "${ECHO_T}/usr/local/include/ncurses/ncurses.h" >&6 curses_h="ncurses/ncurses.h" @@ -45,7 +47,7 @@ curses_includes="-I/usr/local/include " stop_searching=true found_curses_h=true -@@ -10045,7 +10045,7 @@ +@@ -10045,7 +10045,7 @@ echo "${ECHO_T}/usr/local/include/ncurse echo "$as_me:$LINENO: result: /usr/include/ncurses.h" >&5 echo "${ECHO_T}/usr/include/ncurses.h" >&6 curses_h="ncurses.h" @@ -54,7 +56,7 @@ curses_includes="-I/usr/include " stop_searching=true found_curses_h=true -@@ -10060,7 +10060,7 @@ +@@ -10060,7 +10060,7 @@ echo "${ECHO_T}/usr/include/ncurses.h" > echo "$as_me:$LINENO: result: /usr/include/ncurses/ncurses.h" >&5 echo "${ECHO_T}/usr/include/ncurses/ncurses.h" >&6 curses_h="ncurses/ncurses.h" @@ -63,7 +65,7 @@ curses_includes="-I/usr/include " stop_searching=true found_curses_h=true -@@ -10076,7 +10076,7 @@ +@@ -10076,7 +10076,7 @@ echo "${ECHO_T}/usr/include/ncurses/ncur echo "$as_me:$LINENO: result: /usr/local/include/curses.h" >&5 echo "${ECHO_T}/usr/local/include/curses.h" >&6 curses_h="curses.h" @@ -72,7 +74,7 @@ curses_includes="-I/usr/local/include " stop_searching=true found_curses_h=true -@@ -10091,7 +10091,7 @@ +@@ -10091,7 +10091,7 @@ echo "${ECHO_T}/usr/local/include/curses echo "$as_me:$LINENO: result: /usr/local/include/curses/curses.h" >&5 echo "${ECHO_T}/usr/local/include/curses/curses.h" >&6 curses_h="curses/curses.h" @@ -81,7 +83,7 @@ curses_includes="-I/usr/local/include " stop_searching=true found_curses_h=true -@@ -10107,7 +10107,7 @@ +@@ -10107,7 +10107,7 @@ echo "${ECHO_T}/usr/local/include/curses echo "$as_me:$LINENO: result: /usr/include/curses.h" >&5 echo "${ECHO_T}/usr/include/curses.h" >&6 curses_h="curses.h" @@ -90,7 +92,7 @@ curses_includes="-I/usr/include " stop_searching=true found_curses_h=true -@@ -10122,7 +10122,7 @@ +@@ -10122,7 +10122,7 @@ echo "${ECHO_T}/usr/include/curses.h" >& echo "$as_me:$LINENO: result: /usr/include/curses/curses.h" >&5 echo "${ECHO_T}/usr/include/curses/curses.h" >&6 curses_h="curses/curses.h" @@ -99,15 +101,23 @@ curses_includes="-I/usr/include " stop_searching=true found_curses_h=true ---- macros/curses.m4 -+++ macros/curses.m4 -@@ -189,13 +189,13 @@ - -L$curses_location/lib -lncursesw, - -I$curses_location/include ) - AC_SEARCH_CURSES_FILE($curses_location/include, ncurses/ncurses.h, +Index: macros/curses.m4 +=================================================================== +--- macros/curses.m4.orig 2006-03-09 20:44:38.000000000 +0100 ++++ macros/curses.m4 2008-01-10 17:51:19.930248237 +0100 +@@ -182,68 +182,45 @@ AC_DEFUN([AC_SEARCH_CURSES_H], [ + 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, +- -I$curses_location/include ) +- AC_SEARCH_CURSES_FILE($curses_location/include, ncursesw.h, +- -L$curses_location/lib -lncursesw, +- -I$curses_location/include ) +- AC_SEARCH_CURSES_FILE($curses_location/include, ncurses/ncurses.h, - -L$curses_location/lib -lncurses, -+ -L$curses_location/lib -lncursesw, - -I$curses_location/include ) +- -I$curses_location/include ) AC_SEARCH_CURSES_FILE($curses_location/include, ncurses.h, - -L$curses_location/lib -lncurses, + -L$curses_location/lib -lncursesw, @@ -118,8 +128,23 @@ -I$curses_location/include ) else -@@ -218,32 +218,32 @@ - + dnl check lots of default locations + + dnl first preference is ncursesw +- AC_SEARCH_CURSES_FILE(/usr/local/include, ncursesw/ncurses.h, +- -L/usr/local/lib -lncursesw, +- -I/usr/local/include ) +- AC_SEARCH_CURSES_FILE(/usr/local/include/, ncursesw.h, +- -L/usr/local/lib -lncursesw, +- -I/usr/local/include ) +- +- AC_SEARCH_CURSES_FILE(/usr/include, ncursesw/ncurses.h, +- -L/usr/lib -lncursesw, +- -I/usr/include ) +- AC_SEARCH_CURSES_FILE(/usr/include/, ncursesw.h, +- -L/usr/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, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org