diff options
| author | Remi Collet <remi@remirepo.net> | 2023-09-25 09:42:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-09-25 09:42:52 +0200 |
| commit | 9f0ab67bdc8159b416c0c08e9e011795796c5f2a (patch) | |
| tree | 515bf93e3b803be27d962103261af2c85ad82929 /php.spec | |
| parent | eb9b1c1e0292f2ccd9139eda63c4856bd0b98157 (diff) | |
add internal UTC if tzdata is missing
Diffstat (limited to 'php.spec')
| -rw-r--r-- | php.spec | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -137,7 +137,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rclower:~%{rclower}}%{?gh_date:.%{gh_date}} -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 @@ -185,7 +185,7 @@ Patch10: php-8.2.0-curl.patch # Use system nikic/php-parser Patch41: php-8.3.0-parser.patch # use system tzdata -Patch43: php-8.1.0-systzdata-v23.patch +Patch43: php-8.3.0-systzdata-v24.patch # See http://bugs.php.net/53436 # + display PHP version backported from 8.4 Patch44: php-7.4.0-phpize.patch @@ -386,8 +386,12 @@ Summary: Common files for PHP License: PHP-3.01 AND BSD-2-Clause %if %{with tzdata} +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 +Recommends: tzdata +%else Requires: tzdata %endif +%endif %if %{with libpcre} %global pcre2_buildver %(pkg-config --silence-errors --modversion libpcre2-8 2>/dev/null || echo 10.30) Requires: pcre2%{?_isa} >= %{pcre2_buildver} @@ -671,7 +675,7 @@ The extension is linked with Oracle client libraries %{oraclever} "Oracle Client / Server Interoperability Support" (ID 207303.1). You must install libclntsh.so.%{oraclelib} to use this package, -provided by free Oracle Instant Client RPM available from Oracle on: +provided by Oracle Instant Client RPM available from Oracle on: https://www.oracle.com/database/technologies/instant-client/downloads.html Documentation is at http://php.net/oci8 and http://php.net/pdo_oci @@ -1379,7 +1383,7 @@ export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 export SKIP_ONLINE_TESTS=1 export SKIP_IO_CAPTURE_TESTS=1 unset TZ LANG LC_ALL -if ! make test TESTS=-j4; then +if ! make test TESTS=%{?_smp_mflags}; then set +x for f in $(find .. -name \*.diff -type f -print); do if ! grep -q XFAIL "${f/.diff/.phpt}" @@ -1874,6 +1878,9 @@ fi %changelog +* Mon Sep 25 2023 Remi Collet <remi@remirepo.net> - 8.3.0~rc2-3 +- add internal UTC if tzdata is missing + * Thu Sep 21 2023 Remi Collet <remi@remirepo.net> - 8.3.0~rc2-2 - use oracle client library version 19.19 on aarch64 - use official Oracle Instant Client RPM |