- updated to 2.9.8

- updated ncurses patch

diff --git a/nano-ncurses-ncurses.h.patch b/nano-ncurses-ncurses.h.patch
index b19bbd38380bbcd4b2db9fffb757ddd4ef426295..017f53f4f3fdd243432b2d41a2b21b7d51bbe4c8 100644 (file)
--- a/nano-ncurses-ncurses.h.patch
+++ b/nano-ncurses-ncurses.h.patch
@@ -1,5 +1,5 @@
---- ./nano-1.9.99pre2/src/nano.h.orig  2006-08-22 20:48:13.000000000 +0200
-+++ ./nano-1.9.99pre2/src/nano.h       2006-09-14 00:10:39.000000000 +0200
+--- nano-1.9.99pre2/src/nano.h.orig    2006-08-22 20:48:13.000000000 +0200
++++ nano-1.9.99pre2/src/nano.h 2006-09-14 00:10:39.000000000 +0200
 @@ -71,6 +71,8 @@
  /* Ncurses support. */
  #elif defined(HAVE_NCURSES_H)
@@ -9,14 +9,14 @@
  #else
  /* Curses support. */
  #include <curses.h>
---- ./nano-1.9.99pre2/configure.ac.orig        2006-08-29 19:29:57.000000000 +0200
-+++ ./nano-1.9.99pre2/configure.ac     2006-09-14 00:10:31.000000000 +0200
-@@ -400,7 +400,7 @@
- dnl Checks for libraries.
+--- nano-2.9.8/configure.ac.orig       2018-06-12 19:41:34.569620447 +0200
++++ nano-2.9.8/configure.ac    2018-06-12 19:47:56.142949422 +0200
+@@ -531,7 +531,7 @@
+ fi
  
  if eval "test x$CURSES_LIB_NAME = x"; then
--    AC_CHECK_HEADERS(ncurses.h)
-+    AC_CHECK_HEADERS(ncurses.h ncurses/ncurses.h)
+-      AC_CHECK_HEADERS(ncurses.h)
++      AC_CHECK_HEADERS(ncurses.h ncurses/ncurses.h)
  
-     if test x$enable_utf8 != xno; then
-       AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+       if test "x$enable_utf8" != xno; then
+               OLDLIBS="$LIBS"

diff --git a/nano.spec b/nano.spec
index 1a0386587f196995af4c09d6d2e0b64e53e19da8..4846b632a63d661fc57a1f7908fd9900deb917d6 100644 (file)
--- a/nano.spec
+++ b/nano.spec
@@ -1,12 +1,12 @@
 Summary:       GNU nano - Nano's ANOther editor, an enhanced free Pico clone
 Summary(pl.UTF-8):     GNU nano - jeszcze jeden edytor: darmowy, rozbudowany klon Pico
 Name:          nano
-Version:       2.9.1
+Version:       2.9.8
 Release:       1
 License:       GPL v3+
 Group:         Applications/Editors
 Source0:       https://www.nano-editor.org/dist/v2.9/%{name}-%{version}.tar.xz
-# Source0-md5: ecb29612c30996d0d1139b47d3a413ba
+# Source0-md5: 31714360342f9baa344e2fa574c144db
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-info.patch
@@ -43,7 +43,7 @@ lub "idź do wiersza numer".
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p2
+%patch1 -p1
 
 %build
 %{__gettextize}