|
|
@@ -1,4 +1,4 @@
|
|
|
-%global revision 20230424
|
|
|
+%global revision 20240615
|
|
|
%define includedirw %{_includedir}/ncursesw
|
|
|
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
@@ -6,8 +6,8 @@
|
|
|
Summary: A screen handling and optimization package.
|
|
|
Summary(ja): スクリーンの操作と最適化を行うパッケージ
|
|
|
Name: ncurses
|
|
|
-Version: 6.4
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Version: 6.5
|
|
|
+Release: 2%{?_dist_release}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -132,7 +132,7 @@ done
|
|
|
|
|
|
|
|
|
%build
|
|
|
-%define rootdatadir /lib
|
|
|
+%define rootdatadir %{_prefix}/lib
|
|
|
common_options=" \
|
|
|
--enable-colorfgbg \
|
|
|
--enable-hard-tabs \
|
|
|
@@ -162,7 +162,7 @@ for abi in 5 6; do
|
|
|
%configure $(
|
|
|
echo $common_options --with-abi-version=$abi
|
|
|
[ $abi = 5 ] && echo $abi5_options
|
|
|
- [ $char = widec ] && echo --enable-widec
|
|
|
+ [ $char = widec ] && echo --enable-widec || echo --disable-widec
|
|
|
[ $progs = yes ] || echo --without-progs
|
|
|
)
|
|
|
|
|
|
@@ -175,47 +175,28 @@ done
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf ${RPM_BUILD_ROOT}
|
|
|
+rm -rf %{buildroot}
|
|
|
|
|
|
-make -C narrowc5 DESTDIR=$RPM_BUILD_ROOT install.libs
|
|
|
-rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.5*
|
|
|
-make -C widec5 DESTDIR=$RPM_BUILD_ROOT install.libs
|
|
|
-make -C narrowc6 DESTDIR=$RPM_BUILD_ROOT install.libs
|
|
|
-rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.6*
|
|
|
-make -C widec6 DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data,includes,man}
|
|
|
+make -C narrowc5 DESTDIR=%{buildroot} install.libs
|
|
|
+rm %{buildroot}%{_libdir}/lib{tic,tinfo}.so.5*
|
|
|
+make -C widec5 DESTDIR=%{buildroot} install.libs
|
|
|
+make -C narrowc6 DESTDIR=%{buildroot} install.libs
|
|
|
+rm %{buildroot}%{_libdir}/lib{tic,tinfo}.so.6*
|
|
|
+make -C widec6 DESTDIR=%{buildroot} install.{libs,progs,data,includes,man}
|
|
|
|
|
|
-chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
|
|
|
-chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
|
|
|
+chmod 755 %{buildroot}%{_libdir}/lib*.so.*.*
|
|
|
+chmod 644 %{buildroot}%{_libdir}/lib*.a
|
|
|
|
|
|
# move lib{ncurses{,w},tinfo}.so.* to /lib*
|
|
|
-mkdir $RPM_BUILD_ROOT/%{_lib}
|
|
|
-mv $RPM_BUILD_ROOT%{_libdir}/lib{ncurses{,w},tinfo}.so.* $RPM_BUILD_ROOT/%{_lib}
|
|
|
-for l in $RPM_BUILD_ROOT%{_libdir}/lib{ncurses{,w},tinfo}.so; do
|
|
|
- ln -sf $(echo %{_libdir} | \
|
|
|
- sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
|
|
|
+mkdir %{buildroot}/%{_lib}
|
|
|
+for l in %{buildroot}%{_libdir}/lib{ncurses{,w},tinfo}.so.*; do
|
|
|
+ bn=$(basename $l)
|
|
|
+ ln -sf ..%{_libdir}/$bn %{buildroot}/%{_lib}/$bn
|
|
|
done
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT{%{rootdatadir},%{_sysconfdir}}/terminfo
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/terminfo
|
|
|
|
|
|
-# move few basic terminfo entries to /lib
|
|
|
baseterms=
|
|
|
-for termname in \
|
|
|
- ansi dumb linux vt100 vt100-nav vt102 vt220 vt52
|
|
|
-do
|
|
|
- for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo \
|
|
|
- -samefile $RPM_BUILD_ROOT%{_datadir}/terminfo/${termname::1}/$termname)
|
|
|
- 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
|
|
|
- ln -s $(dirname %{_datadir}/$termpath | \
|
|
|
- sed 's,\(^/\|\)[^/][^/]*,..,g')%{rootdatadir}/$termpath \
|
|
|
- $RPM_BUILD_ROOT%{_datadir}/$termpath
|
|
|
-done
|
|
|
|
|
|
# prepare -base and -term file lists
|
|
|
for termname in \
|
|
|
@@ -226,8 +207,8 @@ for termname in \
|
|
|
st{,-\*color} sun teraterm teraterm2.3 tmux{,-\*} vte vte-256color vwmterm \
|
|
|
wsvt25\* xfce xterm xterm-\*
|
|
|
do
|
|
|
- for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do
|
|
|
- for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do
|
|
|
+ for i in %{buildroot}%{_datadir}/terminfo/?/$termname; do
|
|
|
+ for t in $(find %{buildroot}%{_datadir}/terminfo -samefile $i); do
|
|
|
baseterms="$baseterms $(basename $t)"
|
|
|
done
|
|
|
done
|
|
|
@@ -236,8 +217,8 @@ for t in $baseterms; do
|
|
|
echo "%dir %{_datadir}/terminfo/${t::1}"
|
|
|
echo %{_datadir}/terminfo/${t::1}/$t
|
|
|
done 2> /dev/null | sort -u > terms.base
|
|
|
-find $RPM_BUILD_ROOT%{_datadir}/terminfo \! -type d | \
|
|
|
- sed "s|^$RPM_BUILD_ROOT||" | while read t
|
|
|
+find %{buildroot}%{_datadir}/terminfo \! -type d | \
|
|
|
+ sed "s|^%{buildroot}||" | while read t
|
|
|
do
|
|
|
echo "%dir $(dirname $t)"
|
|
|
echo $t
|
|
|
@@ -246,27 +227,43 @@ done 2> /dev/null | sort -u | comm -2 -3 - terms.base > terms.term
|
|
|
cat terms.base terms.term |sort -u > terms.all
|
|
|
|
|
|
# can't replace directory with symlink (rpm bug), symlink all headers
|
|
|
-mkdir $RPM_BUILD_ROOT%{_includedir}/ncurses{,w}
|
|
|
-for l in $RPM_BUILD_ROOT%{_includedir}/*.h; do
|
|
|
- ln -s ../$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncurses
|
|
|
- ln -s ../$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncursesw
|
|
|
+mkdir %{buildroot}%{_includedir}/ncurses{,w}
|
|
|
+for l in %{buildroot}%{_includedir}/*.h; do
|
|
|
+ ln -s ../$(basename $l) %{buildroot}%{_includedir}/ncurses
|
|
|
+ ln -s ../$(basename $l) %{buildroot}%{_includedir}/ncursesw
|
|
|
done
|
|
|
|
|
|
# don't require -ltinfo when linking with --no-add-needed
|
|
|
-for l in $RPM_BUILD_ROOT%{_libdir}/libncurses{,w}.so; do
|
|
|
+for l in %{buildroot}%{_libdir}/libncurses{,w}.so; do
|
|
|
soname=$(basename $(readlink $l))
|
|
|
rm -f $l
|
|
|
echo "INPUT($soname -ltinfo)" > $l
|
|
|
done
|
|
|
-
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/libcurses{,w}.so
|
|
|
-echo "INPUT(-lncurses)" > $RPM_BUILD_ROOT%{_libdir}/libcurses.so
|
|
|
-echo "INPUT(-lncursesw)" > $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
|
|
|
|
|
|
-echo "INPUT(-ltinfo)" > $RPM_BUILD_ROOT%{_libdir}/libtermcap.so
|
|
|
+rm -f %{buildroot}%{_libdir}/libcurses{,w}.so
|
|
|
+echo "INPUT(-lncurses)" > %{buildroot}%{_libdir}/libcurses.so
|
|
|
+echo "INPUT(-lncursesw)" > %{buildroot}%{_libdir}/libcursesw.so
|
|
|
|
|
|
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
|
|
|
-#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/{*_g,ncurses++*}.pc
|
|
|
+echo "INPUT(-ltinfo)" > %{buildroot}%{_libdir}/libtermcap.so
|
|
|
+
|
|
|
+rm -f %{buildroot}%{_bindir}/ncurses*5-config
|
|
|
+rm -f %{buildroot}%{_libdir}/terminfo
|
|
|
+#rm -f %{buildroot}%{_libdir}/pkgconfig/{*_g,ncurses++*}.pc
|
|
|
+
|
|
|
+
|
|
|
+%pre
|
|
|
+r=$(realpath -e /%{_lib}/libncurses.so.5 2>/dev/null)
|
|
|
+if [ -d /bin ] && [[ "${r}" == "%{_libdir}/"* ]]; then
|
|
|
+ for lib in ncurses ncursesw tinfo; do
|
|
|
+ for v in 5 6; do
|
|
|
+ for c in /%{_lib}/lib${lib}.so.${v}*; do
|
|
|
+ bn=$(basename ${c})
|
|
|
+ rm -f /%{_lib}/$bn
|
|
|
+ ln -sf ..%{_libdir}/$bn /%{_lib}/$bn
|
|
|
+ done
|
|
|
+ done
|
|
|
+ done
|
|
|
+fi
|
|
|
|
|
|
|
|
|
%files -f terms.all
|
|
|
@@ -280,7 +277,6 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
|
|
|
/%{_lib}/lib*.so.*
|
|
|
%{_libdir}/lib*.so.*
|
|
|
%dir %{_sysconfdir}/terminfo
|
|
|
-%{rootdatadir}/terminfo
|
|
|
%{_datadir}/tabset
|
|
|
%dir %{_datadir}/terminfo
|
|
|
|
|
|
@@ -333,11 +329,14 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
|
|
|
%endif
|
|
|
|
|
|
|
|
|
-%clean
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+%changelog
|
|
|
+* Mon Jun 17 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.5-2
|
|
|
+- updated to 6.5 + 20240615.
|
|
|
|
|
|
+* Thu May 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.5-1
|
|
|
+- updated to 6.5 + 20240504.
|
|
|
+- prepared for usrmerge.
|
|
|
|
|
|
-%changelog
|
|
|
* Wed Apr 26 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.4-1
|
|
|
- updated to 6.4 + 20230424.
|
|
|
|
