- up to 20160528

diff --git a/ncurses-fix-nonunicode-breakage.patch b/ncurses-fix-nonunicode-breakage.patch
deleted file mode 100644 (file)
index 2a23fb4..0000000
--- a/ncurses-fix-nonunicode-breakage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-ncurses-5.9-20110716.patch changes linux term to use SI/SO (use G1 charset)
-for selecting alternate character set; however, it kept acsc to use CP437
-codes - it had a chance to work on non-unicode terminal only if G1 was mapped
-to CP437 map, which is not the default; the default for G1 is VT100 map, which
-works with VT100-specific acsc string - and that's what this patch changes.
-
---- ncurses-5.9/misc/terminfo.src.orig 2011-11-05 08:32:32.280686759 +0100
-+++ ncurses-5.9/misc/terminfo.src      2011-11-05 13:37:42.217966510 +0100
-@@ -945,6 +945,7 @@
- # Using SI/SO has the drawback that it confuses screen.  SCS would work.
- # However, SCS is buggy (see comment in Debian #515609) -TD
- linux2.6|linux 2.6.x console,
-+      acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-       rmacs=^O,
-       sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-       sgr0=\E[m\017, smacs=^N, use=linux2.2,

diff --git a/ncurses-mouse_trafo-warning.patch b/ncurses-mouse_trafo-warning.patch
deleted file mode 100644 (file)
index 9201312..0000000
--- a/ncurses-mouse_trafo-warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ncurses-5.2/include/curses.tail~   Sat Jun 16 13:47:06 2001
-+++ ncurses-5.2/include/curses.tail    Thu Mar 21 16:58:13 2002
-@@ -59,8 +59,6 @@
- extern NCURSES_EXPORT(int) mouseinterval (int);
- extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW* win,int* y, int* x, bool to_screen);
- 
--#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
--
- /* other non-XSI functions */
- 
- extern NCURSES_EXPORT(int) mcprint (char *, int);     /* direct data to printer */

diff --git a/ncurses.spec b/ncurses.spec
index b117b2919ab00e2042ff9cc1a1e9a98199dab9be..2fb0452908cd6e38ccc9bf28328d2f988f30f5ff 100644 (file)
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -9,7 +9,7 @@
 %endif
 
 %define        basever 6.0
-%define        patchlevel      20151128
+%define        patchlevel      20160528
 Summary:       curses terminal control library
 Summary(de.UTF-8):     curses-Terminal-Control-Library
 Summary(es.UTF-8):     Biblioteca de control de terminal curses
@@ -21,50 +21,31 @@ Summary(tr.UTF-8):  Terminal kontrol kitaplığı
 Summary(uk.UTF-8):     ncurses - нова бібліотека керування терміналами
 Name:          ncurses
 Version:       %{basever}.%{patchlevel}
-Release:       4
+Release:       1
 License:       distributable
 Group:         Libraries
 Source0:       ftp://dickey.his.com/ncurses/%{name}-%{basever}.tar.gz
 # Source0-md5: ee13d052e1ead260d7c28071f46eefb1
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3b05ee835dc20c306e9af2a9d3fbf1f1
-Patch0:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150810.patch.gz
-# Patch0-md5:  2addb3f87c533dc7c7c52afaf62abc79
-Patch1:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150815.patch.gz
-# Patch1-md5:  4db32fa467507f087c4d54f12770e399
-Patch2:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150822.patch.gz
-# Patch2-md5:  b591a06ea10fe00b320e9b5aecf939ec
-Patch3:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150905.patch.gz
-# Patch3-md5:  9f12c80f9b99afab25f0ebbb3ada3d05
-Patch4:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150912.patch.gz
-# Patch4-md5:  f11c2a5381ac75ddd1afd4a5cc6baa60
-Patch5:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150919.patch.gz
-# Patch5-md5:  c25d0b997c37395b243da3ee68013471
-Patch6:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150926.patch.gz
-# Patch6-md5:  e9059272b061ddd78d0e27fc84b3e9da
-Patch7:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151010.patch.gz
-# Patch7-md5:  eaee1c3b67f2189921efd7d336d412f1
-Patch8:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151017.patch.gz
-# Patch8-md5:  746bb7a761dcf895a08871285b96f769
-Patch9:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151024.patch.gz
-# Patch9-md5:  d86fd80f87f12951dadf3a9abc834397
-Patch10:       ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151101.patch.gz
-# Patch10-md5: ad7fd777cbd6860ee8072334b2ed253f
-Patch11:       ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151107.patch.gz
-# Patch11-md5: 1fffd21c5dc95acbe7c750d88ab9e5b9
-Patch12:       ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151121.patch.gz
-# Patch12-md5: d0cd4fc89d80cc6dde53bfecccc99e91
-Patch13:       ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151128.patch.gz
-# Patch13-md5: 7cec35c9fe1d5e67f766e18b06b952d3
+Patch0:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20160423-patch.sh.bz2
+# Patch0-md5:  11359aad640c0b34c59bd984ca901905
+Patch1:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20160507.patch.gz
+# Patch1-md5:  5417059149e9d845ee4c4300baf01bdc
+Patch2:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20160514.patch.gz
+# Patch2-md5:  22a52731756a0f4e40fb7f7876a0af91
+Patch3:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20160521.patch.gz
+# Patch3-md5:  8e6fda0369ef8b20e4295c17e768b2b5
+Patch4:                ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20160528.patch.gz
+# Patch4-md5:  6a7a17b7ecac5e1e8f723adcdeafdde8
 Patch100:      %{name}-screen_hpa_fix.patch
 Patch101:      %{name}-xterm_hpa_fix.patch
 Patch102:      %{name}-meta.patch
 Patch103:      %{name}-xterm-home-end.patch
-Patch104:      %{name}-mouse_trafo-warning.patch
+
 Patch105:      %{name}-gnome-terminal.patch
 # disable rain demo; triggers gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14998
 Patch107:      %{name}-no-rain-demo.patch
-Patch108:      %{name}-fix-nonunicode-breakage.patch
 URL:           http://dickey.his.com/ncurses/ncurses.html
 BuildRequires: automake
 %if %{with ada}
@@ -341,24 +322,14 @@ mv %{name}-%{basever}/* .
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
+
 %patch105 -p1
 %patch107 -p1
-%patch108 -p1
 
 %build
 unset TERMINFO || :