- rel 7; link with wide ncurses and tinfo

Changed files:
    pinfo-amfix.patch -> 1.2
    pinfo-ncurses.patch -> 1.2
    pinfo.spec -> 1.77

diff --git a/pinfo-amfix.patch b/pinfo-amfix.patch
index 2bb1dc76d03cdf044025176b04c63e235b1b15b1..581ae3840167460f56003be8a4a722a9d78ebd99 100644 (file)
--- a/pinfo-amfix.patch
+++ b/pinfo-amfix.patch
@@ -12,3 +12,15 @@
  
  if HAS_READLINE
  else
+diff -urN pinfo-0.6.9.org/configure.ac pinfo-0.6.9/configure.ac
+--- pinfo-0.6.9.org/configure.ac       2006-03-16 17:27:08.000000000 +0100
++++ pinfo-0.6.9/configure.ac   2009-11-10 08:52:01.572442899 +0100
+@@ -222,7 +222,7 @@
+ ## TODO: have this put in config.h instead of passing it on the command line
+ CPPFLAGS="$CPPFLAGS -DCONFIGDIR=\\\"${sysconfdir}/pinforc\\\" -DLOCALEDIR=\\\"${LOCALEDIR}\\\""
+ ## TODO: looks evil
+-MANDIR="`eval MANDIR=$mandir;echo $MANDIR|sed -e \"s#NONE#$ac_default_prefix#\"`"
++MANDIR=`eval MANDIR=$mandir;echo $MANDIR|sed -e "s#NONE#$ac_default_prefix#"`
+ 
+ 
+ 

diff --git a/pinfo-ncurses.patch b/pinfo-ncurses.patch
index cf1a002c62664e756f3604c24d0cdcfd1eea976c..378e4ed189d024d49237d422059a048c1a63ffee 100644 (file)
--- a/pinfo-ncurses.patch
+++ b/pinfo-ncurses.patch
@@ -5,7 +5,7 @@
                        AC_MSG_RESULT([$1/$2])
                        curses_h="$2"
 -                      curses_libs="$3"
-+                      curses_libs="$3 -ltinfo"
++                      curses_libs="$3 -ltinfow"
                        curses_includes="$4"
                        stop_searching=true
                        found_curses_h=true

diff --git a/pinfo.spec b/pinfo.spec
index 03e90c1ac8502b9ab43ba8c7964303a1f0eb5d7c..54ab2edea22047329fcc80726d13f755aa160f63 100644 (file)
--- a/pinfo.spec
+++ b/pinfo.spec
@@ -6,7 +6,7 @@ Summary(ru.UTF-8):      Программа просмотра info- и man-докум
 Summary(uk.UTF-8):     Програма перегляду info- та man-документів у стилі lynx
 Name:          pinfo
 Version:       0.6.9
-Release:       6
+Release:       7
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://alioth.debian.org/download.php/1498/%{name}-%{version}.tar.bz2
@@ -74,8 +74,7 @@ CPPFLAGS="-I%{_includedir}/ncursesw"
 %{__aclocal} -I macros
 %{__autoconf}
 %{__automake}
-%configure \
-       --without-included-gettext
+%configure
 
 %{__make}