- updated to 6.2-20200822

[packages/ncurses.git] / ncurses.spec

diff --git a/ncurses.spec b/ncurses.spec
index f9ba2c079a5de4a5d120b9864a6760df95a8f6be..d351a2f41f5cdf972913412aba1b0a1cb30527a5 100644 (file)
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -8,8 +8,8 @@
 %undefine with_ada
 %endif
 
-%define        basever 6.1
-%define        patchlevel      20190216
+%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
@@ -25,17 +25,15 @@ Release:    1
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.invisible-island.net/ncurses/current/%{name}-%{basever}-%{patchlevel}.tgz
-# Source0-md5: 9c69895ff6400ebc36ffbccbcdeebba3
+# 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
-# disable rain demo; triggers gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14998
-Patch102:      %{name}-no-rain-demo.patch
 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
@@ -45,6 +43,7 @@ BuildRequires:        gcc-ada
 %{?with_cxx:BuildRequires:     libstdc++-devel}
 %{?with_ada:BuildRequires:     m4}
 BuildRequires: pkgconfig
+Conflicts:     slang-libs < 1:2.3.1a-2
 Conflicts:     terminfo < 5.4-0.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -127,8 +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
-Conflicts:     slang-libs < 1:2.3.1a-2
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
 %endif
 
@@ -305,7 +303,6 @@ tworzenia aplikacji używających ncurses w języku Ada95.
 %setup -q -n %{name}-%{basever}-%{patchlevel}
 %patch100 -p1
 %patch101 -p1
-%patch102 -p1
 
 %build
 unset TERMINFO || :
@@ -371,7 +368,7 @@ done
 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
@@ -581,6 +578,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/curs_*.3x*
 %{_mandir}/man3/curscr.3x*
 %{_mandir}/man3/curses_version.3x*
+%{_mandir}/man3/curses_trace.3x*
 %{_mandir}/man3/def_*.3x*
 %{_mandir}/man3/default_colors.3x*
 %{_mandir}/man3/define_key*.3x*
@@ -596,6 +594,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/echo*.3x*
 %{_mandir}/man3/endwin*.3x*
 %{_mandir}/man3/erase*.3x*
+%{_mandir}/man3/exit_curses.3x*
+%{_mandir}/man3/exit_terminfo.3x*
 %{_mandir}/man3/filter*.3x*
 %{_mandir}/man3/find_pair.3x*
 %{_mandir}/man3/find_pair_sp.3x*