diff options
| -rw-r--r-- | php-bartlett-php-compatinfo-db-upstream.patch | 33 | ||||
| -rw-r--r-- | php-bartlett-php-compatinfo-db.spec | 15 |
2 files changed, 10 insertions, 38 deletions
diff --git a/php-bartlett-php-compatinfo-db-upstream.patch b/php-bartlett-php-compatinfo-db-upstream.patch deleted file mode 100644 index a3cfe96..0000000 --- a/php-bartlett-php-compatinfo-db-upstream.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 91f1a3be3613cb60d90ebbde06a2c015c44752fa Mon Sep 17 00:00:00 2001 -From: Laurent Laville <laurent.laville@gmail.com> -Date: Mon, 27 Sep 2021 08:46:20 +0000 -Subject: [PATCH] fix following explain on comment - https://github.com/llaville/php-compatinfo-db/issues/88#issuecomment-927653102 - ---- - data/reference/extension/openssl/40/constants.json | 8 +++++++- - data/reference/extension/openssl/81/constants.json | 13 ------------- - src/Application/Query/Init/InitHandler.php | 2 +- - 3 files changed, 8 insertions(+), 15 deletions(-) - delete mode 100644 data/reference/extension/openssl/81/constants.json - -diff --git a/data/reference/extension/openssl/40/constants.json b/data/reference/extension/openssl/40/constants.json -index f098bcc6..f626e042 100644 ---- a/data/reference/extension/openssl/40/constants.json -+++ b/data/reference/extension/openssl/40/constants.json -@@ -37,7 +37,13 @@ - { - "name": "OPENSSL_SSLV23_PADDING", - "ext_min": "4.0.4", -- "php_min": "4.0.4" -+ "php_min": "4.0.4", -+ "dependencies": [ -+ { -+ "name": "openssl", -+ "constraint": "<3.0.0" -+ } -+ ] - }, - { - "name": "PKCS7_BINARY", - diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index 0ea50b4..cdcbf17 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # See https://github.com/llaville/php-compatinfo-db/releases -%global gh_commit f71dbe522b3075505cb5221d3f29b8fb3863dd47 +%global gh_commit 01ec6b5c93f7bddb2fcf415d2fbcab9b8f5a7a28 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151031 %global gh_owner llaville @@ -28,7 +28,7 @@ %bcond_with im6 %bcond_with im7 -%global upstream_version 3.11.0 +%global upstream_version 3.12.0 #global upstream_prever RC1 Name: php-%{c_vendor}-%{c_project} @@ -49,8 +49,6 @@ Patch0: %{name}-3.10-rpm.patch # - CURL_SSLVERSION constants # - Phar::OPENSSL_SHA* constants Patch1: %{name}-backports.patch -# upstream -Patch2: %{name}-upstream.patch BuildArch: noarch @@ -158,7 +156,6 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5 %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch2 -p1 -b .up %patch1 -p1 -b .backports : relocate @@ -292,6 +289,14 @@ exit $ret %changelog +* Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 3.12.0-1 +- update to 3.12.0 + +* Wed Oct 13 2021 Remi Collet <remi@remirepo.net> - 3.11.0-3 +- add upstream patch for doctrine/dbal 3 +- add upstream patch for zip 1.20.0 +- add upstream patch for xlswriter 1.5.0 + * Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 3.11.0-2 - add upstream patch for OpenSSL test suite |