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

Accepting request 849664 from home:lnussel:usrmove

Browse Source 
- install to /usr (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849664
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=516
This commit is contained in:
Dr. Werner Fink 2020-11-20 13:11:28 +00:00 committed by Git OBS Bridge
parent 3dd0d2849c
commit 118be40b4f
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ncurses.changes
View File

@ -12,6 +12,11 @@ Mon Nov 2 07:43:02 UTC 2020 - Dr. Werner Fink <werner@suse.de>
is supported. IBM's xlclang does not support it (report by Steven is supported. IBM's xlclang does not support it (report by Steven
Pitman). Pitman).
-------------------------------------------------------------------
Wed Oct 28 14:42:54 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- install to /usr (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 26 12:31:53 UTC 2020 - Dr. Werner Fink <werner@suse.de> Mon Oct 26 12:31:53 UTC 2020 - Dr. Werner Fink <werner@suse.de>

33
ncurses.spec
View File

@ -878,14 +878,13 @@ includedir5=%{_incdir}/ncurses5' "$pc"
PATH=$PWD/gzip:$PATH PATH=$PWD/gzip:$PATH
(cd %{root}/; tar -cpSf - *)|tar -xpsSf - -C %{buildroot}/ (cd %{root}/; tar -cpSf - *)|tar -xpsSf - -C %{buildroot}/
rm -rf %{root} rm -rf %{root}
mkdir %{buildroot}/%{_lib}
for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow libtic libticw for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow libtic libticw
do do
for lib in %{buildroot}%{_libdir}/${model}.so.* ; do for lib in %{buildroot}%{_libdir}/${model}.so.* ; do
test -e "${lib}" || continue test -e "${lib}" || continue
mv "${lib}" %{buildroot}/%{_lib}/ || continue mv "${lib}" %{buildroot}%{_libdir}/ || continue
done done
for lib in %{buildroot}/%{_lib}/${model}.so.6 ; do for lib in %{buildroot}%{_libdir}/${model}.so.6 ; do
test -e "${lib}" || continue test -e "${lib}" || continue
test -L "${lib}" || continue test -L "${lib}" || continue
lib=${lib#%{buildroot}} lib=${lib#%{buildroot}}
@ -905,21 +904,21 @@ includedir5=%{_incdir}/ncurses5' "$pc"
esac esac
done done
done done
/sbin/ldconfig -r %{buildroot}/ -n -v /%{_lib} /sbin/ldconfig -r %{buildroot}/ -n -v %{_libdir}
%if 0 %if 0
lnk=%{buildroot}%{_libdir}/libtermcap.so lnk=%{buildroot}%{_libdir}/libtermcap.so
echo '/* GNU ld script */' > ${lnk} echo '/* GNU ld script */' > ${lnk}
echo "INPUT(AS_NEEDED(-ltinfo))" >> ${lnk} echo "INPUT(AS_NEEDED(-ltinfo))" >> ${lnk}
%endif %endif
chmod 0755 %{buildroot}/%{_lib}/lib*.so.* chmod 0755 %{buildroot}%{_libdir}/lib*.so.*
chmod 0755 %{buildroot}/%{_libdir}/lib*.so.* chmod 0755 %{buildroot}%{_libdir}/lib*.so.*
chmod a-x %{buildroot}/%{_libdir}/lib*.a chmod a-x %{buildroot}%{_libdir}/lib*.a
if test -d %{buildroot}%{_libdir}/ncurses5 ; then if test -d %{buildroot}%{_libdir}/ncurses5 ; then
mv %{buildroot}%{_libdir}/ncurses5/*.so.5* %{buildroot}%{_libdir}/ mv %{buildroot}%{_libdir}/ncurses5/*.so.5* %{buildroot}%{_libdir}/
for lib in %{buildroot}%{_libdir}/ncurses5/*.so for lib in %{buildroot}%{_libdir}/ncurses5/*.so
do do
lnk=$lib lnk=$lib
lib=/%{_lib}/${lib##*/}.5 lib=%{_libdir}/${lib##*/}.5
case "${lib##*/}" in case "${lib##*/}" in
libncursesw*) libncursesw*)
rm -f "${lnk}" rm -f "${lnk}"
@ -944,9 +943,9 @@ includedir5=%{_incdir}/ncurses5' "$pc"
do do
for lib in %{buildroot}%{_libdir}/${model}.so.* ; do for lib in %{buildroot}%{_libdir}/${model}.so.* ; do
test -e "${lib}" || continue test -e "${lib}" || continue
mv "${lib}" %{buildroot}/%{_lib}/ || continue mv "${lib}" %{buildroot}%{_libdir}/ || continue
done done
for lib in %{buildroot}/%{_lib}/${model}.so.5 ; do for lib in %{buildroot}%{_libdir}/${model}.so.5 ; do
test -e "${lib}" || continue test -e "${lib}" || continue
test -L "${lib}" || continue test -L "${lib}" || continue
lib=${lib#%{buildroot}} lib=${lib#%{buildroot}}
@ -968,9 +967,9 @@ includedir5=%{_incdir}/ncurses5' "$pc"
esac esac
done done
done done
chmod 0755 %{buildroot}/%{_lib}/lib*.so.5* chmod 0755 %{buildroot}%{_libdir}/lib*.so.5*
chmod 0755 %{buildroot}/%{_libdir}/lib*.so.5* chmod 0755 %{buildroot}%{_libdir}/lib*.so.5*
chmod a-x %{buildroot}/%{_libdir}/ncurses5/lib*.a chmod a-x %{buildroot}%{_libdir}/ncurses5/lib*.a
fi fi
test -n "%{buildroot}" || ldconfig -N test -n "%{buildroot}" || ldconfig -N
mkdir -p %{buildroot}%{_defaultdocdir}/ncurses mkdir -p %{buildroot}%{_defaultdocdir}/ncurses
@ -1093,11 +1092,11 @@ includedir5=%{_incdir}/ncurses5' "$pc"
# No test here # No test here
%else %else
%check %check
LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir} LD_LIBRARY_PATH=%{buildroot}%{_libdir}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
nm -D %{buildroot}/%{_lib}/libncursesw.so.%{basevers} | grep -q in_wch nm -D %{buildroot}%{_libdir}/libncursesw.so.%{basevers} | grep -q in_wch
%if %{with onlytinfo} %if %{with onlytinfo}
nm -D %{buildroot}/%{_lib}/libtinfo.so.%{basevers} | grep -q _nc_read_entry2 nm -D %{buildroot}%{_libdir}/libtinfo.so.%{basevers} | grep -q _nc_read_entry2
%endif %endif
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
pushd test pushd test
@ -1177,12 +1176,10 @@ popd
%files -n libncurses5 %files -n libncurses5
%defattr(-,root,root) %defattr(-,root,root)
/%{_lib}/lib*.so.5*
%{_libdir}/lib*.so.5* %{_libdir}/lib*.so.5*
%files -n libncurses6 %files -n libncurses6
%defattr(-,root,root) %defattr(-,root,root)
/%{_lib}/lib*.so.6*
%{_libdir}/lib*.so.6* %{_libdir}/lib*.so.6*
%files -n ncurses-devel %files -n ncurses-devel