- pinfo-ncurses.patch: fixed linking ncurses with --as-needed

- Release 2

Changed files:
    pinfo-ncurses.patch -> 1.1
    pinfo.spec -> 1.70

diff --git a/pinfo-ncurses.patch b/pinfo-ncurses.patch
new file mode 100644 (file)
index 0000000..cf1a002
--- /dev/null
+++ b/pinfo-ncurses.patch
@@ -0,0 +1,35 @@
+--- pinfo-0.6.9/macros/curses.m4~      2006-03-09 20:44:38.000000000 +0100
++++ pinfo-0.6.9/macros/curses.m4       2007-02-28 00:11:39.000000000 +0100
+@@ -161,7 +161,7 @@
+               then
+                       AC_MSG_RESULT([$1/$2])
+                       curses_h="$2"
+-                      curses_libs="$3"
++                      curses_libs="$3 -ltinfo"
+                       curses_includes="$4"
+                       stop_searching=true
+                       found_curses_h=true
+@@ -254,11 +254,11 @@
+ dnl
+ AC_DEFUN([AC_CHECK_CURSES_COMPILE], [
+ 
+-      dnl save CFLAGS and LDFLAGS and set new ones
++      dnl save CFLAGS and LIBS and set new ones
+       CFLAGS_OLD=$CFLAGS
+       CFLAGS="$CFLAGS $curses_includes"
+-      LDFLAGS_OLD=$LDFLAGS
+-      LDFLAGS="$LDFLAGS $curses_libs"
++      LIBS_OLD=$LIBS
++      LIBS="$LIBS $curses_libs"
+ 
+       dnl do the compile test 
+       AC_MSG_CHECKING([if curses is usable])
+@@ -288,7 +288,7 @@
+ 
+       dnl restore variables
+       CFLAGS=$CFLAGS_OLD
+-      LDFLAGS=$LDFLAGS_OLD
++      LIBS=$LIBS_OLD
+ 
+ ])
+ 

diff --git a/pinfo.spec b/pinfo.spec
index 199b3d2f0ecb92f8540347cf2e63b013afda8115..6b07b8ca12eb09d39a387a73ea39f3bdcfb972a0 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
 Summary(uk.UTF-8):     Програма перегляду info- та man-документів у стилі lynx
 Name:          pinfo
 Version:       0.6.9

-Release:       1
+Release:       2

 License:       GPL v2
 Group:         Applications/System
 Source0:       https://alioth.debian.org/download.php/1498/%{name}-%{version}.tar.bz2
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://alioth.debian.org/download.php/1498/%{name}-%{version}.tar.bz2


@@ -17,6 +17,7 @@ Patch0:               %{name}-amfix.patch
 Patch1:                %{name}-home_etc.patch
 Patch2:                %{name}-pl.po-update.patch
 Patch3:                %{name}-info.patch
 Patch1:                %{name}-home_etc.patch
 Patch2:                %{name}-pl.po-update.patch
 Patch3:                %{name}-info.patch

+Patch4:                %{name}-ncurses.patch

 URL:           http://pinfo.alioth.debian.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 URL:           http://pinfo.alioth.debian.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake


@@ -58,6 +59,7 @@ Pinfo - це програма перегляду info-файлів та man-ст
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1

+%patch4 -p1

 
 rm -f doc/pinfo.info po/stamp-po
 
 
 rm -f doc/pinfo.info po/stamp-po