diff --git a/compat-readline5.spec b/compat-readline5.spec index ea2619c..e4bf088 100644 --- a/compat-readline5.spec +++ b/compat-readline5.spec @@ -25,6 +25,7 @@ Patch20: readline-5.2-shlib.patch Patch21: readline-5.2-redisplay-sigint.patch BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Conflicts: filesystem < 3 %description The Readline library provides a set of functions that allow users to @@ -83,12 +84,11 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT{/%{_lib},%{_libdir}/readline5} -mv $RPM_BUILD_ROOT%{_libdir}/libreadline.so.* $RPM_BUILD_ROOT/%{_lib} +mkdir -p $RPM_BUILD_ROOT%{_libdir}/readline5 mv $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libdir}/readline5 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.so -ln -sf ../../../%{_lib}/libreadline.so.5 $RPM_BUILD_ROOT%{_libdir}/readline5/libreadline.so +ln -sf ../libreadline.so.5 $RPM_BUILD_ROOT%{_libdir}/readline5/libreadline.so ln -sf ../libhistory.so.5 $RPM_BUILD_ROOT%{_libdir}/readline5/libhistory.so mkdir $RPM_BUILD_ROOT%{_includedir}/readline5 @@ -107,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES COPYING NEWS README USAGE -/%{_lib}/libreadline*.so.* +%{_libdir}/libreadline*.so.* %{_libdir}/libhistory*.so.* %files devel