From 0f6b2f98a0a7a5b5876021b160513a2608f36880 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Aug 01 2017 08:51:50 +0000 Subject: use %make_install instead of %makeinstall ... which is deprecated --- diff --git a/zsh.spec b/zsh.spec index addac52..4b3d032 100644 --- a/zsh.spec +++ b/zsh.spec @@ -89,12 +89,12 @@ make %{?_smp_mflags} all html make check %install -%makeinstall install.info \ - fndir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/functions \ - sitefndir=$RPM_BUILD_ROOT%{_datadir}/%{name}/site-functions \ - scriptdir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/scripts \ - sitescriptdir=$RPM_BUILD_ROOT%{_datadir}/%{name}/scripts \ - runhelpdir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/help +%make_install install.info \ + fndir=%{_datadir}/%{name}/%{version}/functions \ + sitefndir=%{_datadir}/%{name}/site-functions \ + scriptdir=%{_datadir}/%{name}/%{version}/scripts \ + sitescriptdir=%{_datadir}/%{name}/scripts \ + runhelpdir=%{_datadir}/%{name}/%{version}/help rm -f $RPM_BUILD_ROOT%{_bindir}/zsh-%{version} rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -116,9 +116,6 @@ for i in checkmail harden run-help zcalc zkbd; do chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i done -sed -i "s!$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/help!%{_datadir}/%{name}/%{version}/help!" \ - $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/{run-help,_run-help} - %post if [ "$1" = 1 ]; then @@ -170,6 +167,7 @@ fi %changelog * Tue Aug 01 2017 Kamil Dudka - 5.3.1-12 +- use %%make_install instead of %%makeinstall, which is deprecated - modernize spec file (Group tag, %%clean, %%defattr) * Thu Jul 27 2017 Fedora Release Engineering - 5.3.1-11