From f67d04439075254815cf3e0dfcedc84a643e3af0accfb38aedd4be0ed55013d9 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 20 Nov 2020 13:11:39 +0000 Subject: [PATCH] Accepting request 849670 from home:lnussel:usrmove - get rid of /lib hack and install readline in /usr. Bash is already there anyways (boo#1029961) - remove deprecated %install_info OBS-URL: https://build.opensuse.org/request/show/849670 OBS-URL: https://build.opensuse.org/package/show/Base:System/readline?expand=0&rev=23 --- readline.changes | 7 +++++++ readline.spec | 36 +++++------------------------------- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/readline.changes b/readline.changes index 6226504..ba006d9 100644 --- a/readline.changes +++ b/readline.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 28 14:04:30 UTC 2020 - Ludwig Nussel + +- get rid of /lib hack and install readline in /usr. Bash is already there + anyways (boo#1029961) +- remove deprecated %install_info + ------------------------------------------------------------------- Thu Jul 16 19:13:54 UTC 2020 - Andreas Stieger diff --git a/readline.spec b/readline.spec index 521789d..df54cae 100644 --- a/readline.spec +++ b/readline.spec @@ -98,8 +98,6 @@ This package contains the static library for the readline library. %package doc Summary: Documentation how to Use and Program with the Readline Library Group: Documentation/Other -Requires(post): %{install_info_prereq} -Requires(preun): %{install_info_prereq} Supplements: (libreadline%{rl_major} and patterns-base-documentation) Provides: readline:%{_infodir}/readline.info.gz BuildArch: noarch @@ -213,41 +211,17 @@ export CC_FOR_BUILD CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD CFLAGS LDFLAGS CC %make_build documentation %install -%make_install htmldir=%{_docdir}/%{name} installdir=%{_docdir}/%{name}/examples \ - libdir=/%{_lib} linkagedir=%{_libdir} -chmod 0755 %{buildroot}/%{_lib}/libhistory.so.%{version} -chmod 0755 %{buildroot}/%{_lib}/libreadline.so.%{version} -rm -vf %{buildroot}/%{_lib}/libhistory.so.%{version}*old -rm -vf %{buildroot}/%{_lib}/libreadline.so.%{version}*old -rm -vf %{buildroot}/%{_lib}/libhistory.so -rm -vf %{buildroot}/%{_lib}/libreadline.so -mkdir -p %{buildroot}/%{_libdir}/pkgconfig -ln -sf /%{_lib}/libhistory.so.%{version} %{buildroot}/%{_libdir}/libhistory.so -ln -sf /%{_lib}/libreadline.so.%{version} %{buildroot}/%{_libdir}/libreadline.so -mv -vf %{buildroot}/%{_lib}/libhistory.a %{buildroot}/%{_libdir}/libhistory.a -mv -vf %{buildroot}/%{_lib}/libreadline.a %{buildroot}/%{_libdir}/libreadline.a -mv -vf %{buildroot}/%{_lib}/pkgconfig/readline.pc \ - %{buildroot}/%{_libdir}/pkgconfig/readline.pc -rm -vrf %{buildroot}%{_datadir}/readline/ +%make_install htmldir=%{_docdir}/%{name} installdir=%{_docdir}/%{name}/examples %post -n libreadline%{rl_major} -p /sbin/ldconfig %postun -n libreadline%{rl_major} -p /sbin/ldconfig -%post doc -%install_info --info-dir=%{_infodir} %{_infodir}/history.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/readline.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/rluserman.info.gz - -%preun doc -%install_info_delete --info-dir=%{_infodir} %{_infodir}/history.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/readline.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/rluserman.info.gz %files -n libreadline%{rl_major} %license COPYING -/%{_lib}/libhistory.so.%{rl_major} -/%{_lib}/libhistory.so.%{version} -/%{_lib}/libreadline.so.%{rl_major} -/%{_lib}/libreadline.so.%{version} +%{_libdir}/libhistory.so.%{rl_major} +%{_libdir}/libhistory.so.%{version} +%{_libdir}/libreadline.so.%{rl_major} +%{_libdir}/libreadline.so.%{version} %files devel %{_includedir}/readline/