diff options
| -rw-r--r-- | php.spec | 28 |
1 files changed, 18 insertions, 10 deletions
@@ -71,7 +71,12 @@ # Optional components; pass "--with mssql" etc to rpmbuild. %global with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0} %global with_imap 1 +# until firebird available in EPEL +%if 0%{?rhel} == 8 +%global with_interbase 0 +%else %global with_interbase 1 +%endif %global with_freetds 1 %global with_tidy 1 %global with_sqlite3 1 @@ -108,7 +113,7 @@ %global with_systemd 0 %endif # httpd 2.4.10 with httpd-filesystem and sethandler support -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 %global with_httpd2410 1 %else %global with_httpd2410 0 @@ -131,7 +136,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{lower}} -Release: 2%{?dist} +Release: 3%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -242,7 +247,7 @@ Requires(pre): httpd-filesystem %else Requires(pre): httpd %endif -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 # httpd have threaded MPM by default Recommends: %{?scl_prefix}php-fpm%{?_isa} = %{version}-%{release} %endif @@ -1039,7 +1044,7 @@ sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \ -e "s:@BINDIR@:%{_bindir}:" \ -e "s:@SCL@:%{?scl:%{scl}_}:" \ %{SOURCE3} | tee macros.php -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 echo '%%%{?scl:%{scl}_}pecl_xmldir %{_localstatedir}/lib/php/peclxml' | tee -a macros.php %endif @@ -1401,7 +1406,7 @@ install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/wsdlcache install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/opcache -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/peclxml install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/pecl install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/tests/pecl @@ -1434,7 +1439,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf.default . # install systemd unit files and scripts for handling server startup %if %{with_systemd} install -Dm 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf %endif @@ -1477,7 +1482,7 @@ sed -e 's:/run:%{_localstatedir}/run:' \ -i $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm # Environment file -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 sed -e '/EnvironmentFile/d' -i $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service %else install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig @@ -1720,7 +1725,7 @@ fi %dir %{_libdir}/php/modules %dir %{_localstatedir}/lib/php %dir %{_datadir}/php -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 %dir %{_localstatedir}/lib/php/peclxml %dir %{_docdir}/pecl %dir %{_datadir}/tests @@ -1766,14 +1771,14 @@ fi %config(noreplace) %{_sysconfdir}/php-fpm.conf %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf %config(noreplace) %{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm -%if 0%{?fedora} < 26 +%if 0%{?fedora} < 26 && 0%{?rhel} < 8 %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm %endif # {_prefix}/lib/tmpfiles.d/php-fpm.conf %if %{with_systemd} %{_unitdir}/%{?scl_prefix}php-fpm.service %dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 %{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf %{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf %endif @@ -1864,6 +1869,9 @@ fi %changelog +* Thu Jan 17 2019 Remi Collet <remi@remirepo.net> 7.3.1-3 +- cleanup for EL-8 + * Wed Jan 16 2019 Remi Collet <remi@remirepo.net> - 7.3.1-2 - test build for https://bugs.php.net/77430 |