From 7cb4544948f7fee83bc4e6eb9b42f10f4b95a881 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 11 Jan 2017 17:42:11 +0100 Subject: [PATCH] stop moving libreadline under /lib This is reverts e56f02adc2a135ef6e1e3ed1950242295ce9d0dc: (05:39:16 PM) mlichvar: /lib is a symlink to /usr/lib these days, so I guess it doesn't matter (05:39:44 PM) mlichvar: simpler spec is a better spec :) Signed-off-by: Igor Gnatenko --- readline.spec | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/readline.spec b/readline.spec index be329a3..673e7d6 100644 --- a/readline.spec +++ b/readline.spec @@ -59,13 +59,6 @@ export CPPFLAGS="-I%{_includedir}/ncurses" %install %make_install -mkdir $RPM_BUILD_ROOT/%{_lib} -mv $RPM_BUILD_ROOT%{_libdir}/libreadline.so.* $RPM_BUILD_ROOT/%{_lib} -for l in $RPM_BUILD_ROOT%{_libdir}/libreadline.so; do - ln -sf $(echo %{_libdir} | \ - sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l -done - rm -rf $RPM_BUILD_ROOT%{_datadir}/readline rm -rf $RPM_BUILD_ROOT%{_docdir}/readline rm -f $RPM_BUILD_ROOT%{_infodir}/dir* @@ -98,20 +91,23 @@ fi %files %license COPYING %doc CHANGES NEWS README USAGE -/%{_lib}/libreadline*.so.* -%{_libdir}/libhistory*.so.* +%{_libdir}/libreadline.so.* +%{_libdir}/libhistory.so.* %{_infodir}/history.info* %{_infodir}/rluserman.info* %files devel %doc examples/*.c examples/*.h examples/rlfe -%{_includedir}/readline -%{_libdir}/lib*.so -%{_mandir}/man3/* +%{_includedir}/readline/ +%{_libdir}/libreadline.so +%{_libdir}/libhistory.so +%{_mandir}/man3/readline.3* +%{_mandir}/man3/history.3* %{_infodir}/readline.info* %files static -%{_libdir}/lib*.a +%{_libdir}/libreadline.a +%{_libdir}/libhistory.a %changelog * Thu Feb 04 2016 Fedora Release Engineering - 6.3-8