summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec18
1 files changed, 13 insertions, 5 deletions
diff --git a/php.spec b/php.spec
index b5f90ff..f1efce2 100644
--- a/php.spec
+++ b/php.spec
@@ -97,9 +97,9 @@
%global with_zip 0
-%global gh_commit 636c827aa2f72deb6d4f431a95b39a182b32dbeb
+%global gh_commit ed179c2ef4ed4d371267da9d1b745df519ffa0d5
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date 20200409
+%global gh_date 20200415
%global gh_owner php
%global gh_project php-src
%global upver 8.0.0
@@ -109,7 +109,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 1%{?dist}
+Release: 3%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -1371,7 +1371,7 @@ cp %{SOURCE9} modconf
%endif
# Dual config file with httpd >= 2.4 (RHEL >= 7)
-install -D -m 644 modconf $RPM_BUILD_ROOT%{_httpd_modconfdir}/15-%{name}.conf
+install -D -m 644 modconf $RPM_BUILD_ROOT%{_httpd_modconfdir}/20-%{name}.conf
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/%{name}.conf
%if %{with_httpd2410}
cat %{SOURCE10} >>$RPM_BUILD_ROOT%{_httpd_confdir}/%{name}.conf
@@ -1664,7 +1664,7 @@ fi
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/wsdlcache
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/opcache
%config(noreplace) %{_httpd_confdir}/%{name}.conf
-%config(noreplace) %{_httpd_modconfdir}/15-%{name}.conf
+%config(noreplace) %{_httpd_modconfdir}/20-%{name}.conf
%files common -f files.common
%doc EXTENSIONS NEWS UPGRADING* README.REDIST.BINS *md docs
@@ -1814,6 +1814,14 @@ fi
%changelog
+* Wed Apr 15 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200415-3
+- new snapshot
+
+* Fri Apr 10 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200409-2
+- new snapshot
+- refresh php.ini from upstream
+- rename 15-php80-php.conf to 20-php70-php.conf to ensure load order
+
* Thu Apr 9 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200409-1
- update to 8.0.0-dev