forked from pool/ncurses
ncurses patch 20180120 and 20180121 as well as tack 1.08-20170818
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=348
This commit is contained in:
Git OBS Bridge
69
ncurses.spec
69
ncurses.spec
@@ -61,7 +61,7 @@ Source2: handle.linux
|
||||
Source3: README.devel
|
||||
Source4: ncurses-rpmlintrc
|
||||
# Latest tack can be found at ftp://invisible-island.net/pub/ncurses/current/
|
||||
Source5: ftp://invisible-island.net/pub/ncurses/current/tack-1.07-20170318.tgz
|
||||
Source5: ftp://invisible-island.net/pub/ncurses/current/tack-1.08-20170818.tgz
|
||||
Source6: edit.sed
|
||||
Source7: baselibs.conf
|
||||
Patch0: ncurses-6.0.dif
|
||||
@@ -406,9 +406,8 @@ rm -vf mk-dlls.sh
|
||||
%endif
|
||||
--with-dlsym \
|
||||
--with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \
|
||||
--with-termlib=tinfo \
|
||||
--with-ticlib=tic \
|
||||
--with-xterm-kbs=del \
|
||||
--disable-stripping \
|
||||
--disable-root-environ \
|
||||
--disable-termcap \
|
||||
--disable-overwrite \
|
||||
@@ -430,7 +429,12 @@ rm -vf mk-dlls.sh
|
||||
--with-pthread \
|
||||
--enable-reentrant \
|
||||
--enable-ext-mouse \
|
||||
--disable-widec \
|
||||
--enable-widec \
|
||||
--with-termlib=tinfow \
|
||||
--with-ticlib=ticw \
|
||||
%if %{with symversion}
|
||||
--with-versioned-syms=${PWD}/package/ncursestw.map \
|
||||
%endif
|
||||
--enable-ext-colors \
|
||||
--enable-weak-symbols \
|
||||
--enable-wgetch-events \
|
||||
@@ -452,9 +456,6 @@ rm -vf mk-dlls.sh
|
||||
%else
|
||||
--with-fallbacks="" \
|
||||
%endif
|
||||
%if %{with symversion}
|
||||
--with-versioned-syms=${PWD}/package/ncursest.map \
|
||||
%endif
|
||||
%if %{with hasheddb}
|
||||
--with-hashed-db \
|
||||
%endif
|
||||
@@ -483,29 +484,31 @@ rm -vf mk-dlls.sh
|
||||
# of our preferred fallback terminfo list into the final
|
||||
# fallback.c.
|
||||
#
|
||||
mkdir lib/.build
|
||||
cp -p progs/tic progs/tic.build
|
||||
cp -p progs/infocmp progs/infocmp.build
|
||||
cp -p lib/*.so* lib/.build/
|
||||
PATH=$PWD/progs:$OPATH
|
||||
LD_LIBRARY_PATH=$PWD/lib
|
||||
export LD_LIBRARY_PATH PATH
|
||||
export PATH
|
||||
(cat > ${PWD}/.build_tic)<<-EOF
|
||||
export LD_LIBRARY_PATH=$PWD/lib/.build
|
||||
export BUILD_TIC=$PWD/progs/tic.build
|
||||
export BUILD_INFOCMP=$PWD/progs/infocmp.build
|
||||
EOF
|
||||
pushd ncurses/
|
||||
TERMINFO=$PWD/tmp
|
||||
export TERMINFO
|
||||
mkdir -p $TERMINFO
|
||||
(cat > ${PWD}/.build_tic)<<-EOF
|
||||
export BUILD_TIC=$PWD/../progs/tic.build
|
||||
export BUILD_INFOCMP=$PWD/../progs/infocmp.build
|
||||
EOF
|
||||
. ${PWD}/.build_tic
|
||||
. ${PWD}/../.build_tic
|
||||
$BUILD_TIC -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src
|
||||
$BUILD_TIC -o $TERMINFO -s terminfo.src
|
||||
sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $BUILD_TIC ${FALLBK//,/ } > fallback.c
|
||||
rm -rf $TERMINFO
|
||||
unset TERMINFO
|
||||
cp -p fallback.c ../fallback.c.build
|
||||
unset LD_LIBRARY_PATH
|
||||
popd
|
||||
PATH=$OPATH
|
||||
unset LD_LIBRARY_PATH
|
||||
#
|
||||
# Now rebuild libncurses and do the rest of this job
|
||||
#
|
||||
@@ -523,7 +526,7 @@ rm -vf mk-dlls.sh
|
||||
find man/ -name '*.[1-8]x.*' -print -delete
|
||||
make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir}
|
||||
ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir}
|
||||
sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
|
||||
sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config
|
||||
mkdir pc
|
||||
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
|
||||
#
|
||||
@@ -552,11 +555,13 @@ rm -vf mk-dlls.sh
|
||||
--disable-reentrant \
|
||||
--disable-ext-mouse \
|
||||
--disable-widec \
|
||||
--disable-ext-colors \
|
||||
--disable-overwrite \
|
||||
--with-termlib=tinfo \
|
||||
--with-ticlib=tic \
|
||||
%if %{with symversion}
|
||||
--with-versioned-syms=${PWD}/package/ncurses.map \
|
||||
%endif
|
||||
--disable-ext-colors \
|
||||
--disable-overwrite \
|
||||
--without-progs
|
||||
sleep 1
|
||||
kill $pid
|
||||
@@ -589,7 +594,7 @@ rm -vf mk-dlls.sh
|
||||
done
|
||||
|
||||
#
|
||||
# Now use --enable-widec for UTF8/wide character support.
|
||||
# Now use --disable-widec for narrow character support.
|
||||
# The libs with 16 bit wide characters are binary incompatible
|
||||
# to the normal 8bit wide character libs.
|
||||
#
|
||||
@@ -599,14 +604,14 @@ rm -vf mk-dlls.sh
|
||||
eval screen -D -m ./${c#*./} --with-pthread \
|
||||
--enable-reentrant \
|
||||
--enable-ext-mouse \
|
||||
--enable-widec \
|
||||
--with-termlib=tinfow \
|
||||
--with-ticlib=ticw \
|
||||
--disable-widec \
|
||||
--with-termlib=tinfo \
|
||||
--with-ticlib=tic \
|
||||
%if %{with symversion}
|
||||
--with-versioned-syms=${PWD}/package/ncursest.map \
|
||||
%endif
|
||||
--enable-ext-colors \
|
||||
--disable-overwrite \
|
||||
%if %{with symversion}
|
||||
--with-versioned-syms=${PWD}/package/ncursestw.map \
|
||||
%endif
|
||||
--without-progs
|
||||
sleep 1
|
||||
kill $pid
|
||||
@@ -618,9 +623,9 @@ rm -vf mk-dlls.sh
|
||||
make %{?_smp_mflags}
|
||||
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
|
||||
make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir}
|
||||
sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfow" %{root}%{_bindir}/ncursesw6-config
|
||||
sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfow" %{root}%{_bindir}/ncurses6-config
|
||||
pushd man
|
||||
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1
|
||||
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1
|
||||
popd
|
||||
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
|
||||
|
||||
@@ -641,11 +646,11 @@ rm -vf mk-dlls.sh
|
||||
--enable-widec \
|
||||
--with-termlib=tinfow \
|
||||
--with-ticlib=ticw \
|
||||
--disable-ext-colors \
|
||||
--disable-overwrite \
|
||||
%if %{with symversion}
|
||||
--with-versioned-syms=${PWD}/package/ncursesw.map \
|
||||
%endif
|
||||
--disable-ext-colors \
|
||||
--disable-overwrite \
|
||||
--without-progs
|
||||
sleep 1
|
||||
kill $pid
|
||||
@@ -791,10 +796,8 @@ rm -vf mk-dlls.sh
|
||||
install -m 644 NEWS %{buildroot}%{_defaultdocdir}/ncurses/
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/terminfo
|
||||
mkdir -p %{buildroot}%{_miscdir}
|
||||
LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{buildroot}/%{_lib}
|
||||
export LD_LIBRARY_PATH
|
||||
pushd ncurses/
|
||||
. ${PWD}/.build_tic
|
||||
. ${PWD}/../.build_tic
|
||||
{ echo "# See annotated version in %{_defaultdocdir}/ncurses/terminfo.src.bz2"
|
||||
$BUILD_TIC -C -r ../misc/terminfo.src | grep -E -v '^#'; } > termcap
|
||||
# Gererate new termcap entries for various linux consoles
|
||||
@@ -802,8 +805,8 @@ rm -vf mk-dlls.sh
|
||||
TERMINFO=%{buildroot}%{_datadir}/terminfo \
|
||||
bash %{SOURCE2}
|
||||
install -m 0644 termcap.new %{buildroot}%{_miscdir}/termcap
|
||||
unset LD_LIBRARY_PATH
|
||||
popd
|
||||
unset LD_LIBRARY_PATH
|
||||
if test `%{_bindir}/id -u` = '0' ; then
|
||||
chown root:root %{buildroot}%{_miscdir}/termcap
|
||||
chmod 0644 %{buildroot}%{_miscdir}/termcap
|
||||
|
||||
Reference in New Issue
Block a user