diff --git a/php7.spec b/php7.spec index 4736b1f..b0ef54e 100644 --- a/php7.spec +++ b/php7.spec @@ -7,7 +7,7 @@ Name: php7 Version: 7.4.33 -Release: 3mamba +Release: 4mamba Summary: The PHP HTML-embedded scripting language Group: Applications/Development Vendor: openmamba @@ -26,7 +26,6 @@ License: PHP License BuildRequires: glibc-devel BuildRequires: libacl-devel BuildRequires: libapparmor-devel -BuildRequires: libattr-devel BuildRequires: libbzip2-devel BuildRequires: libcurl-devel BuildRequires: libdb53-devel @@ -269,6 +268,25 @@ This package adds PHP support to the Apache Web Server. # phpize dir sed -i "s|@libdir@\`/build|@libdir@\`/php/build|" scripts/phpize.in +# php7 include dir +sed -E "s|(includedir[\t ]*=.*/php)|\17|g" \ + -i scripts/phpize.in + +sed -e "s|\[php-config\]|\[php-config7\]|g" \ + -e "s|\(PHP_ARG_WITH(\[php-config\)7\]|\1]|g" \ + -e "s|php-config, no|php-config7, no|g" \ + -i "scripts/phpize.m4" + +sed -E "s|(phpincludedir[\t ]*=.*/php)|\17|g" \ + -i scripts/Makefile.frag + +sed -E "s|(include_dir[\t ]*=.*php)|\17|g" \ + -i scripts/php-config.in + +# systemd service: run php-fpm7 instead of php-fpm +sed -i "s|/php-fpm |/php-fpm7|" sapi/fpm/php-fpm.service.in +sed -i "s|/run/php-fpm/|/run/php7-fpm/|" sapi/fpm/php-fpm.service.in + # prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE cp TSRM/LICENSE TSRM_LICENSE @@ -505,8 +523,8 @@ fi %defattr(-,root,root) %{_bindir}/php-config7 %{_bindir}/phpize7 -%dir %{_includedir}/php -%{_includedir}/php/* +%dir %{_includedir}/php7 +%{_includedir}/php7/* %{_mandir}/man1/php-config7.1* %{_mandir}/man1/phpize7.1* #%doc CODING_STANDARDS.md EXTENSIONS README.md NEWS @@ -565,6 +583,10 @@ fi %config(noreplace) %{_sysconfdir}/httpd/httpd.d/php7.conf %changelog +* Tue Feb 06 2024 Silvan Calarco 7.4.33-4mamba +- fix php7-fpm service file so that it runs php-fpm7 +- install headers in %{_includedir}/php7 + * Tue Jan 16 2024 Silvan Calarco 7.4.33-3mamba - php-fpm: configure to use alternative rundir /run/php7-fpm