[php] switch from suffix to prefix (avoid broken update from previous build)
Remi Collet
remi at fedoraproject.org
Wed Jan 25 21:18:28 UTC 2012
commit 1ac87eb4c16d4aae42395e234325c041dfd52b41
Author: remi <fedora at famillecollet.com>
Date: Wed Jan 25 22:17:54 2012 +0100
switch from suffix to prefix (avoid broken update from previous build)
macros.php | 2 +-
php.spec | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/macros.php b/macros.php
index dde7ee4..8900aba 100644
--- a/macros.php
+++ b/macros.php
@@ -15,4 +15,4 @@
%php_ztsincldir %{_includedir}/php-zts/php
%__php %{_bindir}/php
-%__ztsphp %{_bindir}/php-zts
+%__ztsphp %{_bindir}/zts-php
diff --git a/php.spec b/php.spec
index f7a41ff..dee8630 100644
--- a/php.spec
+++ b/php.spec
@@ -933,9 +933,9 @@ make -C build-zts install-modules \
INSTALL_ROOT=$RPM_BUILD_ROOT
# rename ZTS binary
-mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php-zts
-mv $RPM_BUILD_ROOT%{_bindir}/phpize $RPM_BUILD_ROOT%{_bindir}/phpize-zts
-mv $RPM_BUILD_ROOT%{_bindir}/php-config $RPM_BUILD_ROOT%{_bindir}/php-config-zts
+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 \
@@ -1188,10 +1188,10 @@ fi
%files devel
%defattr(-,root,root)
%{_bindir}/php-config
-%{_bindir}/php-config-zts
-%{_bindir}/phpize-zts
+%{_bindir}/zts-php-config
+%{_bindir}/zts-phpize
# usefull only to test other module during build
-%{_bindir}/php-zts
+%{_bindir}/zts-php
%{_includedir}/php
%{_includedir}/php-zts
%{_libdir}/php/build
@@ -1234,7 +1234,7 @@ fi
%changelog
* Wed Jan 25 2012 Remi Collet <remi at fedoraproject.org> 5.4.0-0.2.RC6
-- all binaries in /usr/bin with zts suffix
+- all binaries in /usr/bin with zts prefix
* Wed Jan 18 2012 Remi Collet <remi at fedoraproject.org> 5.4.0-0.1.RC6
- update to PHP 5.4.0RC6
More information about the scm-commits
mailing list