From 0721f6fe17d54f9d1b28b6b10cad4c2edbad06b1 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Thu, 30 Nov 2006 11:54:43 +0000
Subject: [PATCH] - move also hardlinked entries (#217750) - search
 /etc/terminfo for local terminfo entries Resolves: #217750

---
 ncurses.spec | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/ncurses.spec b/ncurses.spec
index b0978d2..2e12cdc 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: A terminal handling library
 Name: ncurses
 Version: 5.5
-Release: 25.20060715%{?dist}
+Release: 26.20060715%{?dist}
 License: distributable
 Group: System Environment/Libraries
 URL: http://invisible-island.net/ncurses/ncurses.html
@@ -67,7 +67,7 @@ zcat %{SOURCE4} | sh > /dev/null
     --with-shared --without-ada --with-ospeed=unsigned \\\
     --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
     --with-install-prefix=$RPM_BUILD_ROOT \\\
-    --with-terminfo-dirs=%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
+    --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
     --enable-overwrite \\\
     --with-chtype=long
 
@@ -103,11 +103,20 @@ for l in $RPM_BUILD_ROOT%{_libdir}/libncurses.so; do
         sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
 done
 
+mkdir -p $RPM_BUILD_ROOT{%{rootdatadir},%{_sysconfdir}}/terminfo
+
 # move few basic terminfo entries to /lib
-mkdir -p $RPM_BUILD_ROOT%{rootdatadir}/terminfo
+baseterms=""
 for termname in \
         ansi dumb linux vt100 vt100-nav vt220 xterm
 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
     mkdir $RPM_BUILD_ROOT%{rootdatadir}/terminfo/${termname::1} || : &> /dev/null
     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
 /%{_lib}/libncurses*.so.*
 %{_libdir}/lib*.so.*
+%dir %{_sysconfdir}/terminfo
 %{rootdatadir}/terminfo
 %{_datadir}/terminfo
 %{_datadir}/tabset
@@ -167,6 +177,10 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %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
 - move libncurses and some terminfo entries out of /usr
 - drop console symlink and sparc terminfo entries