diff --git a/ncurses.spec b/ncurses.spec index d8bdf73..99c07a0 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -4,7 +4,7 @@ %define tack_ver 1.07 Name: ncurses Version: 6.0.20170121 -Release: 1mamba +Release: 3mamba Summary: A CRT screen handling and optimization package Group: System/Libraries Vendor: openmamba @@ -49,17 +49,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The curses library routines are a terminal-independent method of updating character screens with reasonalble optimization. The ncurses (new curses) library is a freely distributable replacement for the discontinued 4.4BSD classic curses library. -%package terminfo-extras +%package terminfo Summary: Extra terminal information files Group: System/Libraries Requires: libncurses = %{version}-%{release} +Provides: ncurses-terminfo-extras +Obsoletes: ncurses-terminfo-extras -%description terminfo-extras +%description terminfo Extra terminal information files. %package -n libncurses Summary: The development files for applications which use ncurses Group: System/Libraries +Requires: ncurses-terminfo %description -n libncurses The curses library routines are a terminal-independent method of updating character screens with reasonalble optimization. The ncurses (new curses) library is a freely distributable replacement for the discontinued 4.4BSD classic curses library. @@ -184,20 +187,22 @@ ln -sf libncursesw.a %{buildroot}%{_libdir}/libcursesw.a # fix strange permissions chmod 755 %{buildroot}/%{_libdir}/*.so.* -DEFAULT_TERMINFOS="ansi ansi-m console dumb color_xterm linux pcansi-m screen vt52 vt100 vt102 vt220 xterm" - -find %{buildroot}%{_datadir}/terminfo -type d | sed "s|^%{buildroot}|%dir |" >> filelist-terminfo -find %{buildroot}%{_datadir}/terminfo -type f -o -type l | sed "s|^%{buildroot}||" > filelist-terminfo - -> filelist-terminfo-default -for t in $DEFAULT_TERMINFOS; do - F=`grep "/${t}\$" filelist-terminfo` - [ "$F" ] && { - echo "$F" >> filelist-terminfo-default - sed -i "/\/${t}$/d" filelist-terminfo - } -done -: +#DEFAULT_TERMINFOS="\ +#ansi ansi-m console dumb color_xterm linux pcansi-m screen vt52 vt100 vt102 vt220 \ +#xterm xterm-256color" +# +#find %{buildroot}%{_datadir}/terminfo -type d | sed "s|^%{buildroot}|%dir |" >> filelist-terminfo +#find %{buildroot}%{_datadir}/terminfo -type f -o -type l | sed "s|^%{buildroot}||" > filelist-terminfo +# +#> filelist-terminfo-default +#for t in $DEFAULT_TERMINFOS; do +# F=`grep "/${t}\$" filelist-terminfo` +# [ "$F" ] && { +# echo "$F" >> filelist-terminfo-default +# sed -i "/\/${t}$/d" filelist-terminfo +# } +#done +#: %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -221,7 +226,7 @@ done %{_mandir}/man5/* %{_mandir}/man7/* -%files -n libncurses -f filelist-terminfo-default +%files -n libncurses %defattr(-,root,root) %{_libdir}/libform.so.* %{_libdir}/libformw.so.* @@ -233,7 +238,6 @@ done %{_libdir}/libpanelw.so.* %{_libdir}/libtic.so.* %{_libdir}/libticw.so.* -%dir %{_datadir}/terminfo #%{_datadir}/terminfo/* %if "%{_target_cpu}" != "x86_64" %{_libdir}/terminfo @@ -265,10 +269,18 @@ done %doc c++/README* %doc README ANNOUNCE doc/html/announce.html -%files terminfo-extras -f filelist-terminfo +%files terminfo %defattr(-,root,root) +%dir %{_datadir}/terminfo +%{_datadir}/terminfo/* %changelog +* Wed Feb 01 2017 Silvan Calarco 6.0.20170121-3mamba +- provide all terminfo in ncurses-terminfo package required by libncurses; obsolete ncurses-terminfo-extras + +* Wed Feb 01 2017 Silvan Calarco 6.0.20170121-2mamba +- add xterm-256color to default installed terminfos as required by recent konsole + * Fri Jan 27 2017 Silvan Calarco 6.0.20170121-1mamba - update to 6.0.20170121