- updated to 6.2-20200822

- removed obsolete gcc10 patch
- dropped old no-rain-demo patch, require gnat 4.1 instead

diff --git a/gcc10.patch b/gcc10.patch
deleted file mode 100644 (file)
index daa1ec2..0000000
--- a/gcc10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ncurses-6.1-20200118/aclocal.m4~   2020-01-18 18:30:44.000000000 +0100
-+++ ncurses-6.1-20200118/aclocal.m4    2020-05-19 08:49:10.694013352 +0200
-@@ -1145,7 +1145,7 @@
- [
- AC_REQUIRE([CF_GNAT_VERSION])
- case $cf_cv_gnat_version in
--(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]])
-+(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|1[[0-9]].*|20[[0-9]][[0-9]])
-       cf_cv_prog_gnat_correct=yes
-       ;;
- (*)
---- ncurses-6.1-20200118/configure~    2020-01-12 01:10:58.000000000 +0100
-+++ ncurses-6.1-20200118/configure     2020-05-19 08:52:57.975016517 +0200
-@@ -24346,7 +24346,7 @@
- test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
- 
- case $cf_cv_gnat_version in
--(3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9])
-+(3.1[1-9]*|3.[2-9]*|[4-9].*|1[0-9].*|20[0-9][0-9])
-       cf_cv_prog_gnat_correct=yes
-       ;;
- (*)

diff --git a/ncurses-no-rain-demo.patch b/ncurses-no-rain-demo.patch
deleted file mode 100644 (file)
index 9dc1ac9..0000000
--- a/ncurses-no-rain-demo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ncurses-6.1-20191026/Ada95/samples/Makefile.in~    2019-09-08 02:01:38.000000000 +0200
-+++ ncurses-6.1-20191026/Ada95/samples/Makefile.in     2019-10-28 18:30:23.507868923 +0100
-@@ -105,7 +105,7 @@ THISLIB            = sample
- CARGS         = -cargs $(ADAFLAGS)
- LARGS         = -largs -L../lib -l@ADA_LIBNAME@ @TEST_ARG2@ $(LD_FLAGS) @TEST_LIBS2@
- 
--PROGS         = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x 
-+PROGS         = tour$x ncurses$x @USE_GNAT_SIGINT@
- 
- all ::  $(PROGS)
-       @echo made $@

diff --git a/ncurses.spec b/ncurses.spec
index e90c567c41d837421d7bf9b1aa10497868f7e1eb..d351a2f41f5cdf972913412aba1b0a1cb30527a5 100644 (file)
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -8,8 +8,8 @@
 %undefine with_ada
 %endif
 
 %undefine with_ada
 %endif
 

-%define        basever 6.1
-%define        patchlevel      20200118
+%define        basever 6.2
+%define        patchlevel      20200822

 Summary:       curses terminal control library
 Summary(de.UTF-8):     curses-Terminal-Control-Library
 Summary(es.UTF-8):     Biblioteca de control de terminal curses
 Summary:       curses terminal control library
 Summary(de.UTF-8):     curses-Terminal-Control-Library
 Summary(es.UTF-8):     Biblioteca de control de terminal curses


@@ -21,22 +21,19 @@ Summary(tr.UTF-8):  Terminal kontrol kitaplığı
 Summary(uk.UTF-8):     ncurses - нова бібліотека керування терміналами
 Name:          ncurses
 Version:       %{basever}.%{patchlevel}
 Summary(uk.UTF-8):     ncurses - нова бібліотека керування терміналами
 Name:          ncurses
 Version:       %{basever}.%{patchlevel}

-Release:       5
+Release:       1

 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.invisible-island.net/ncurses/current/%{name}-%{basever}-%{patchlevel}.tgz
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.invisible-island.net/ncurses/current/%{name}-%{basever}-%{patchlevel}.tgz

-# Source0-md5: e0ac9b5fc62d94f0ebcb94a6b39b798e
+# Source0-md5: 54d3f5aaeafb3b7755db7399d753ce06

 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3b05ee835dc20c306e9af2a9d3fbf1f1
 Patch100:      %{name}-xterm-home-end.patch
 Patch101:      %{name}-gnome-terminal.patch
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3b05ee835dc20c306e9af2a9d3fbf1f1
 Patch100:      %{name}-xterm-home-end.patch
 Patch101:      %{name}-gnome-terminal.patch

-# disable rain demo; triggers gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14998
-Patch102:      %{name}-no-rain-demo.patch
-Patch103:      gcc10.patch

 URL:           http://dickey.his.com/ncurses/ncurses.html
 BuildRequires: automake
 %if %{with ada}
 URL:           http://dickey.his.com/ncurses/ncurses.html
 BuildRequires: automake
 %if %{with ada}

-BuildRequires: gcc-ada
+BuildRequires: gcc-ada >= 6:4.1.0

 # gnat bug: https://bugzilla.redhat.com/show_bug.cgi?id=613407
 # gcc patch: https://bugzilla.redhat.com/attachment.cgi?id=435931
 # seems worker around when using gcc 4.6.2? --q
 # gnat bug: https://bugzilla.redhat.com/show_bug.cgi?id=613407
 # gcc patch: https://bugzilla.redhat.com/attachment.cgi?id=435931
 # seems worker around when using gcc 4.6.2? --q


@@ -129,7 +126,7 @@ Summary(pt_BR.UTF-8):       Base de dados terminfo para terminais adicionais (menos us
 Group:         Applications/Terminal
 Requires:      %{name} = %{version}-%{release}
 Obsoletes:     ncurses-extraterms
 Group:         Applications/Terminal
 Requires:      %{name} = %{version}-%{release}
 Obsoletes:     ncurses-extraterms

-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"

 BuildArch:     noarch
 %endif
 
 BuildArch:     noarch
 %endif
 


@@ -306,8 +303,6 @@ tworzenia aplikacji używających ncurses w języku Ada95.
 %setup -q -n %{name}-%{basever}-%{patchlevel}
 %patch100 -p1
 %patch101 -p1
 %setup -q -n %{name}-%{basever}-%{patchlevel}
 %patch100 -p1
 %patch101 -p1

-%patch102 -p1
-%patch103 -p1

 
 %build
 unset TERMINFO || :
 
 %build
 unset TERMINFO || :


@@ -373,7 +368,7 @@ done
 ln -sf ../l/linux $RPM_BUILD_ROOT%{_datadir}/terminfo/c/console
 
 # used by /{bin,sbin} programs
 ln -sf ../l/linux $RPM_BUILD_ROOT%{_datadir}/terminfo/c/console
 
 # used by /{bin,sbin} programs

-mv -f $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.6* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.6* $RPM_BUILD_ROOT/%{_lib}

 # adjust symlinks for libncursesw.so.6 in /%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libncursesw.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
 # adjust symlinks for libncursesw.so.6 in /%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libncursesw.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libcursesw.so