packages: php/php.spec - rel 5; install correct php-fpm

arekm arekm at pld-linux.org
Thu Feb 9 08:55:44 CET 2012


Author: arekm                        Date: Thu Feb  9 07:55:44 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; install correct php-fpm

---- Files affected:
packages/php:
   php.spec (1.976 -> 1.977) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.976 packages/php/php.spec:1.977
--- packages/php/php.spec:1.976	Thu Feb  9 01:11:45 2012
+++ packages/php/php.spec	Thu Feb  9 08:55:38 2012
@@ -111,7 +111,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel	4
+%define		rel	5
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -2405,6 +2405,8 @@
 %if %{with fpm}
 %{__make} -f Makefile.fpm install-fpm \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
+# Makefile.fpm incorrectly installs libtool script instead of final binary so overwrite
+libtool --mode=install install -p sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}
 
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/fpm.d}
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/php-fpm
@@ -3326,6 +3328,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.977  2012/02/09 07:55:38  arekm
+- rel 5; install correct php-fpm
+
 Revision 1.976  2012/02/09 00:11:45  adamg
 - release 4 (rebuild against libpng-1.5)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.976&r2=1.977&f=u



More information about the pld-cvs-commit mailing list