summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-25 09:59:54 +0200
committerRemi Collet <remi@remirepo.net>2019-10-25 10:00:21 +0200
commit1730e100dc68753a8e740950b4f6754e1fcb5feb (patch)
treef160ecb4ec080461102c4080b8b3a64a66c1f45b
parente5f40da8075b343c3211e09a092d2519d7d4952f (diff)
add /usr/share/php/preload as default ffi.preload configuration
-rw-r--r--20-ffi.ini4
-rw-r--r--php74.spec14
2 files changed, 12 insertions, 6 deletions
diff --git a/20-ffi.ini b/20-ffi.ini
index a4e30cc..0bce40d 100644
--- a/20-ffi.ini
+++ b/20-ffi.ini
@@ -8,4 +8,6 @@ extension=ffi
;ffi.enable=preload
; List of headers files to preload, wildcard patterns allowed.
-;ffi.preload=
+; /usr/share/php/preload used by for RPM packages
+; /usr/local/share/php/preload may be used for local files
+ffi.preload=/usr/share/php/preload/*.h:/usr/local/share/php/preload/*.h
diff --git a/php74.spec b/php74.spec
index b503e31..0b860c7 100644
--- a/php74.spec
+++ b/php74.spec
@@ -103,7 +103,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: %{upver}%{?rcver:~%{lower}}
-Release: 12%{?dist}
+Release: 13%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -1192,7 +1192,7 @@ mkdir build-cgi build-apache build-embedded \
rm ext/date/tests/timezone_location_get.phpt
rm ext/date/tests/timezone_version_get.phpt
rm ext/date/tests/timezone_version_get_basic1.phpt
-%if 0%{?fedora} < 28
+%if 0%{?fedora} < 29
# need tzdata 2018i
rm ext/date/tests/bug33414-1.phpt
rm ext/date/tests/bug33415-2.phpt
@@ -1679,7 +1679,7 @@ install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
# For third-party packaging:
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php/preload
# install the DSO
install -m 755 -d $RPM_BUILD_ROOT%{_httpd_moddir}
@@ -1930,7 +1930,7 @@ rm -f README.{Zeus,QNX,CVS-RULES}
%pre common
-%if %{?fedora}%{!?fedora:99} < 28
+%if %{?fedora}%{!?fedora:99} < 29
echo -e "WARNING : Fedora %{fedora} is now EOL :"
echo -e "You should consider upgrading to a supported release.\n"
%endif
@@ -2017,7 +2017,7 @@ fi
%dir %{_libdir}/php-zts/modules
%endif
%dir %{_localstatedir}/lib/php
-%if 0%{?fedora} >= 24
+%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
%dir %{_localstatedir}/lib/php/peclxml
%dir %{_docdir}/pecl
%dir %{_datadir}/tests
@@ -2151,9 +2151,13 @@ fi
%files json -f files.json
%files sodium -f files.sodium
%files ffi -f files.ffi
+%dir %{_datadir}/php
%changelog
+* Fri Oct 25 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC4-13
+- add /usr/share/php/preload as default ffi.preload configuration
+
* Thu Oct 24 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC4-12
- allow wildcards in ffi.preload