Author: sparky Date: Wed Feb 23 23:38:31 2011 GMT Module: packages Tag: HEAD ---- Log message: - don't silent libtool instalation - rearranged litespeed build
---- Files affected: packages/php: php.spec (1.918 -> 1.919) ---- Diffs: ================================================================ Index: packages/php/php.spec diff -u packages/php/php.spec:1.918 packages/php/php.spec:1.919 --- packages/php/php.spec:1.918 Wed Feb 23 22:33:05 2011 +++ packages/php/php.spec Thu Feb 24 00:38:26 2011 @@ -1861,6 +1861,9 @@ %patch60 -p1 %patch61 -p1 +%{__rm} -r sapi/litespeed +gzip -dc %{SOURCE15} | tar xf - -C sapi/ + %if "%{pld_release}" != "ac" sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 %endif @@ -1947,6 +1950,9 @@ %if %{with cgi} cgi-fcgi %endif +%if %{with litespeed} +litespeed +%endif %if %{with fpm} fpm %endif @@ -1956,9 +1962,6 @@ %if %{with apache2} apxs2 %endif -%if %{with litespeed} -litespeed -%endif " for sapi in $sapis; do : SAPI $sapi @@ -2126,7 +2129,6 @@ %endif %if %{with litespeed} -gzip -dc %{SOURCE15} | tar xf - -C sapi/ %{__make} -f Makefile.litespeed %endif @@ -2239,20 +2241,20 @@ # install Apache1 DSO module %if %{with apache1} -libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1 +libtool --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1 %endif # install Apache2 DSO module %if %{with apache2} -libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache +libtool --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache %endif # install litespeed sapi %if %{with litespeed} -libtool --silent --mode=install install sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/php.litespeed +libtool --mode=install install sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/php.litespeed %endif -libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} +libtool --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} # fix install paths, avoid evil rpaths sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la # better solution? @@ -2260,7 +2262,7 @@ # install CGI/FCGI %if %{with cgi} -libtool --silent --mode=install install sapi/cgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/php.cgi +libtool --mode=install install sapi/cgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/php.cgi ln -sf php.cgi $RPM_BUILD_ROOT%{_bindir}/php.fcgi cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini %endif @@ -2268,7 +2270,7 @@ # install FCGI PM %if %{with fpm} install -d $RPM_BUILD_ROOT{%{_sysconfdir}/fpm.d,%{_sbindir}} -libtool --silent --mode=install install sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir} +libtool --mode=install install sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir} cp -a sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8 cp -a sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir} install -d $RPM_BUILD_ROOT/etc/rc.d/init.d @@ -2278,7 +2280,7 @@ %endif # install CLI -libtool --silent --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli +libtool --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 @@ -3163,6 +3165,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.919 2011/02/23 23:38:26 sparky +- don't silent libtool instalation +- rearranged litespeed build + Revision 1.918 2011/02/23 21:33:05 sparky - BR: mysql-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.918&r2=1.919&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit