diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-24 18:12:17 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-24 18:12:17 +0200 |
| commit | 23fa15779c6f0833abb5810854bea7032754dfaa (patch) | |
| tree | e4d3a95baff17ec78f665be84c089726adcebbc2 | |
| parent | f564b500ca718e735ed72530a52c4fe57d2c3ea6 (diff) | |
php56-php: cleanup + rebuild
| -rw-r--r-- | php/php.spec | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/php/php.spec b/php/php.spec index da58711..bcdd154 100644 --- a/php/php.spec +++ b/php/php.spec @@ -20,7 +20,7 @@ %global oci8ver 2.0.9 # Use for first build of PHP (before pecl/zip and pecl/jsonc) -%global php_bootstrap 1 +%global php_bootstrap 0 # Adds -z now to the linker flags %global _hardened_build 1 @@ -45,7 +45,7 @@ %global _httpd_contentdir /var/www %endif -%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) +%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_root_sysconfdir}/rpm; echo $d) %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) @@ -151,7 +151,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: 5.6.0 -Release: 0.0.%{rcver}%{?dist} +Release: 0.1.%{rcver}%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1371,9 +1371,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm # make the cli commands available in standard root for SCL build %if 0%{?scl:1} -#install -m 755 -d $RPM_BUILD_ROOT%{_root_bindir} -#ln -s %{_bindir}/php $RPM_BUILD_ROOT%{_root_bindir}/%{?scl_prefix}php -#ln -s %{_bindir}/phar.phar $RPM_BUILD_ROOT%{_root_bindir}/%{?scl_prefix}phar +install -m 755 -d $RPM_BUILD_ROOT%{_root_bindir} +ln -s %{_bindir}/php $RPM_BUILD_ROOT%{_root_bindir}/%{scl} +ln -s %{_bindir}/phar.phar $RPM_BUILD_ROOT%{_root_bindir}/%{scl_prefix}phar %endif # Generate files lists and stub .ini files for each subpackage @@ -1627,6 +1627,10 @@ fi %{_mandir}/man1/phar.phar.1* %{_mandir}/man1/phpize.1* %doc sapi/cgi/README* sapi/cli/README +%if 0%{?scl:1} +%{_root_bindir}/%{scl} +%{_root_bindir}/%{scl_prefix}phar +%endif %files dbg %defattr(-,root,root) |