diff --git a/ncurses.spec b/ncurses.spec index eee8c2e..786a7b0 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -126,19 +126,19 @@ common_options="\ --with-ticlib=tic \ --with-xterm-kbs=DEL \ --without-ada" -abi5_options="--with-chtype=long" -for abi in 6; do +abi=6 + +if true; then for char in narrowc widec; do mkdir $char$abi pushd $char$abi ln -s ../configure . - [ $abi = 6 -a $char = widec ] && progs=yes || progs=no + [ $char = widec ] && progs=yes || progs=no %configure $( echo $common_options --with-abi-version=$abi - [ $abi = 5 ] && echo $abi5_options [ $char = widec ] && echo --enable-widec [ $progs = yes ] || echo --without-progs ) @@ -148,7 +148,7 @@ for abi in 6; do popd done -done +fi %install make -C narrowc6 DESTDIR=$RPM_BUILD_ROOT install.libs @@ -208,7 +208,6 @@ echo "INPUT(-lncursesw)" > $RPM_BUILD_ROOT%{_libdir}/libcursesw.so echo "INPUT(-ltinfo)" > $RPM_BUILD_ROOT%{_libdir}/libtermcap.so -rm -f $RPM_BUILD_ROOT%{_bindir}/ncurses*5-config rm -f $RPM_BUILD_ROOT%{_libdir}/terminfo rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*_g.pc