summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-07-30 08:53:50 +0200
committerRemi Collet <fedora@famillecollet.com>2014-07-30 08:53:50 +0200
commit4b87459e68eec5243e3428ae02c0e4b7b3c4f0c2 (patch)
tree008eabb3292cbadc76c6d87817b34b5c9bdcc698
parent4e04540b7466db1d7ec44bd1dbf7becc794b1015 (diff)
php 5.4: fix zts-php-config
-rw-r--r--php54.spec18
1 files changed, 10 insertions, 8 deletions
diff --git a/php54.spec b/php54.spec
index 863bcec..79ae04d 100644
--- a/php54.spec
+++ b/php54.spec
@@ -88,7 +88,7 @@ Version: 5.4.31
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.2.%{?snapdate}%{?rcver}%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -1140,6 +1140,8 @@ EXTENSION_DIR=%{_libdir}/php-zts/modules
build --includedir=%{_includedir}/php-zts \
--libdir=%{_libdir}/php-zts \
--enable-maintainer-zts \
+ --program-prefix=zts- \
+ --disable-cgi \
--with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
--enable-pcntl \
--with-imap=shared --with-imap-ssl \
@@ -1264,11 +1266,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/pdo_mysql.so \
make -C build-zts install-modules \
INSTALL_ROOT=$RPM_BUILD_ROOT
-# rename ZTS binary
-mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/zts-php
-mv $RPM_BUILD_ROOT%{_bindir}/phpize $RPM_BUILD_ROOT%{_bindir}/zts-phpize
-mv $RPM_BUILD_ROOT%{_bindir}/php-config $RPM_BUILD_ROOT%{_bindir}/zts-php-config
-
# Install the version for embedded script language in applications + php_embed.h
make -C build-embedded install-sapi install-headers \
INSTALL_ROOT=$RPM_BUILD_ROOT
@@ -1580,12 +1577,14 @@ fi
%files cli
%defattr(-,root,root)
%{_bindir}/php
+%{_bindir}/zts-php
%{_bindir}/php-cgi
%{_bindir}/phar.phar
%{_bindir}/phar
# provides phpize here (not in -devel) for pecl command
%{_bindir}/phpize
%{_mandir}/man1/php.1*
+%{_mandir}/man1/zts-php.1*
%{_mandir}/man1/php-cgi.1*
%{_mandir}/man1/phar.1*
%{_mandir}/man1/phar.phar.1*
@@ -1630,13 +1629,13 @@ fi
%{_bindir}/php-config
%{_bindir}/zts-php-config
%{_bindir}/zts-phpize
-# usefull only to test other module during build
-%{_bindir}/zts-php
%{_includedir}/php
%{_includedir}/php-zts
%{_libdir}/php/build
%{_libdir}/php-zts/build
%{_mandir}/man1/php-config.1*
+%{_mandir}/man1/zts-php-config.1*
+%{_mandir}/man1/zts-phpize.1*
%{macrosdir}/macros.php
%files embedded
@@ -1682,6 +1681,9 @@ fi
%changelog
+* Wed Jul 30 2014 Remi Collet <rcollet@redhat.com> 5.4.31-2
+- fix zts-php-config --php-binary output #1124605
+
* Thu Jul 24 2014 Remi Collet <remi@fedoraproject.org> 5.4.31-1
- Update to 5.4.31
http://www.php.net/releases/5_4_31.php