- move also hardlinked entries (#217750)

- search /etc/terminfo for local terminfo entries Resolves: #217750
This commit is contained in:
Miroslav Lichvar 2006-11-30 11:54:43 +00:00
parent 4d72df00ac
commit 0721f6fe17

View File

@ -1,7 +1,7 @@
Summary: A terminal handling library Summary: A terminal handling library
Name: ncurses Name: ncurses
Version: 5.5 Version: 5.5
Release: 25.20060715%{?dist} Release: 26.20060715%{?dist}
License: distributable License: distributable
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://invisible-island.net/ncurses/ncurses.html URL: http://invisible-island.net/ncurses/ncurses.html
@ -67,7 +67,7 @@ zcat %{SOURCE4} | sh > /dev/null
--with-shared --without-ada --with-ospeed=unsigned \\\ --with-shared --without-ada --with-ospeed=unsigned \\\
--enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\ --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
--with-install-prefix=$RPM_BUILD_ROOT \\\ --with-install-prefix=$RPM_BUILD_ROOT \\\
--with-terminfo-dirs=%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
--enable-overwrite \\\ --enable-overwrite \\\
--with-chtype=long --with-chtype=long
@ -103,11 +103,20 @@ for l in $RPM_BUILD_ROOT%{_libdir}/libncurses.so; do
sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
done done
mkdir -p $RPM_BUILD_ROOT{%{rootdatadir},%{_sysconfdir}}/terminfo
# move few basic terminfo entries to /lib # move few basic terminfo entries to /lib
mkdir -p $RPM_BUILD_ROOT%{rootdatadir}/terminfo baseterms=""
for termname in \ for termname in \
ansi dumb linux vt100 vt100-nav vt220 xterm ansi dumb linux vt100 vt100-nav vt220 xterm
do do
linkedterms=$(find $RPM_BUILD_ROOT%{_datadir}/terminfo \
-samefile $RPM_BUILD_ROOT%{_datadir}/terminfo/${termname::1}/$termname)
for t in $linkedterms; do
baseterms="$baseterms $(basename $t)"
done
done
for termname in $baseterms; do
termpath=terminfo/${termname::1}/$termname termpath=terminfo/${termname::1}/$termname
mkdir $RPM_BUILD_ROOT%{rootdatadir}/terminfo/${termname::1} || : &> /dev/null mkdir $RPM_BUILD_ROOT%{rootdatadir}/terminfo/${termname::1} || : &> /dev/null
mv $RPM_BUILD_ROOT%{_datadir}/$termpath $RPM_BUILD_ROOT/%{rootdatadir}/$termpath mv $RPM_BUILD_ROOT%{_datadir}/$termpath $RPM_BUILD_ROOT/%{rootdatadir}/$termpath
@ -132,6 +141,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
%doc README ANNOUNCE doc/html/announce.html %doc README ANNOUNCE doc/html/announce.html
/%{_lib}/libncurses*.so.* /%{_lib}/libncurses*.so.*
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%dir %{_sysconfdir}/terminfo
%{rootdatadir}/terminfo %{rootdatadir}/terminfo
%{_datadir}/terminfo %{_datadir}/terminfo
%{_datadir}/tabset %{_datadir}/tabset
@ -167,6 +177,10 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
%changelog %changelog
* Thu Nov 30 2006 Miroslav Lichvar <mlichvar@redhat.com> 5.5-26.20060715
- move also hardlinked entries (#217750)
- search /etc/terminfo for local terminfo entries
* Mon Nov 27 2006 Miroslav Lichvar <mlichvar@redhat.com> 5.5-25.20060715 * Mon Nov 27 2006 Miroslav Lichvar <mlichvar@redhat.com> 5.5-25.20060715
- move libncurses and some terminfo entries out of /usr - move libncurses and some terminfo entries out of /usr
- drop console symlink and sparc terminfo entries - drop console symlink and sparc terminfo entries