rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

libtinfo(w) now depends on normal/wide character API of libncurses(w)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=298
This commit is contained in:
Dr. Werner Fink 2017-04-13 13:28:29 +00:00 committed by Git OBS Bridge
parent ac14649f01
commit 8ea4efa20d
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ncurses.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 13 13:16:58 UTC 2017 - werner@suse.de
- With one of the latest update patches libtinfo now has become
splitted into a normal and wide character version (boo#1033198)
-------------------------------------------------------------------
Mon Apr 10 09:40:23 UTC 2017 - werner@suse.de

24
ncurses.spec
View File

@ -564,10 +564,11 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
make clean
> $SCREENLOG
tail -q -s 0.5 -f $SCREENLOG & pid=$!
eval screen -D -m ./${c#*./} --with-pthread \
eval screen -D -m ./${c#*./} --with-pthread \
--enable-reentrant \
--enable-ext-mouse \
--enable-widec \
--with-termlib=tinfow \
--enable-ext-colors \
--disable-overwrite \
%if %{with symversion}
@ -606,6 +607,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
--disable-reentrant \
--disable-ext-mouse \
--enable-widec \
--with-termlib=tinfow \
--disable-ext-colors \
--disable-overwrite \
%if %{with symversion}
@ -650,7 +652,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
(cd %{root}/; tar -cpSf - *)|tar -xpsSf - -C %{buildroot}/
rm -rf %{root}
mkdir %{buildroot}/%{_lib}
for model in libncurses libncursest libncursesw libncursestw libtinfo
for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow
do
for lib in %{buildroot}%{_libdir}/${model}.so.* ; do
test -e "${lib}" || continue
@ -662,6 +664,11 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
lib=${lib#%{buildroot}}
lnk=%{buildroot}%{_libdir}/${model}.so
case "${lib##*/}" in
libncursesw*)
rm -f ${lnk}
echo '/* GNU ld script */' > ${lnk}
echo "INPUT(${lib} AS_NEEDED(-ltinfow -ldl))" >> ${lnk}
;;
libncurses*)
rm -f ${lnk}
echo '/* GNU ld script */' > ${lnk}
@ -686,6 +693,11 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
lnk=$lib
lib=/%{_lib}/${lib##*/}.5
case "${lib##*/}" in
libncursesw*)
rm -f "${lnk}"
echo '/* GNU ld script */' > ${lnk}
echo "INPUT(${lib} AS_NEEDED(-ltinfow))">> ${lnk}
;;
libncurses*)
rm -f "${lnk}"
echo '/* GNU ld script */' > ${lnk}
@ -700,7 +712,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
ln -sf ../${lib##*/} ${lnk}
esac
done
for model in libncurses libncursest libncursesw libncursestw libtinfo
for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow
do
for lib in %{buildroot}%{_libdir}/${model}.so.* ; do
test -e "${lib}" || continue
@ -712,6 +724,12 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
lib=${lib#%{buildroot}}
lnk=%{buildroot}%{_libdir}/ncurses5/${model}.so
case "${lib##*/}" in
libncursesw*)
rm -f ${lnk}
echo '/* GNU ld script */' > ${lnk}
echo 'SEARCH_DIR(%{_libdir}/ncurses5)' >> ${lnk}
echo "INPUT(${lib} AS_NEEDED(-ltinfow))">> ${lnk}
;;
libncurses*)
rm -f ${lnk}
echo '/* GNU ld script */' > ${lnk}