From 3009fa201f631cb6b8fc9b03e653ca096ace034b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 24 Aug 2012 01:34:01 +0300 Subject: [PATCH] restore php.cli in PHP_5_2 branch Revert "cli package contains versioned binary, convience php binary in -program" This reverts commit 71e3994a8b3759e6b6567c2383e43491c65f0a70. --- php.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/php.spec b/php.spec index 7b21e47..cd97838 100644 --- a/php.spec +++ b/php.spec @@ -2470,10 +2470,11 @@ cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm %endif # install CLI -libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/%{name} -cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 -echo ".so %{name}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1 -ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/php +libtool --silent --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli +install sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1 +echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1 + +ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini %if %{with fcgi} @@ -2714,8 +2715,8 @@ fi %defattr(644,root,root,755) %dir %{_sysconfdir}/cli.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini -%attr(755,root,root) %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* +%attr(755,root,root) %{_bindir}/php.cli +%{_mandir}/man1/php.cli.1* %files program %defattr(644,root,root,755) -- 2.44.0