summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-12-20 11:38:00 +0100
committerRemi Collet <remi@php.net>2021-12-20 11:38:00 +0100
commitc500bc3b358725b7959736669d98ee09bacf7210 (patch)
tree1a05bef7fd31cda9dfdb7898bdaabc311671f808
parentc539bf5ce3b40dfd5e33fd2ce82be41439a6d735 (diff)
cleanupHEADmaster
-rw-r--r--php-bartlett-php-compatinfo-db-up.patch125
-rw-r--r--php-bartlett-php-compatinfo-db.spec2
2 files changed, 0 insertions, 127 deletions
diff --git a/php-bartlett-php-compatinfo-db-up.patch b/php-bartlett-php-compatinfo-db-up.patch
deleted file mode 100644
index 581b23e..0000000
--- a/php-bartlett-php-compatinfo-db-up.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 6451fd1d1a80c55c05438301b330c5c1c39e369f Mon Sep 17 00:00:00 2001
-From: Laurent Laville <laurent.laville@gmail.com>
-Date: Fri, 3 Dec 2021 11:23:37 +0000
-Subject: [PATCH 1/2] update rdkafka reference to version 6.0.0RC2 and fix
- issue #99
-
----
- CHANGELOG-3.x.md | 1 +
- .../extension/rdkafka/1/constants.json | 39 +++++++++++++++++--
- .../extension/rdkafka/6/releases.json | 7 ++++
- docs/appendix/SUPPORTED-VERSIONS_3.x.md | 1 +
- 4 files changed, 45 insertions(+), 3 deletions(-)
-
-diff --git a/data/reference/extension/rdkafka/1/constants.json b/data/reference/extension/rdkafka/1/constants.json
-index 0fe12201..f8adacab 100644
---- a/data/reference/extension/rdkafka/1/constants.json
-+++ b/data/reference/extension/rdkafka/1/constants.json
-@@ -948,7 +948,18 @@
- "dependencies": [
- {
- "name": "librdkafka",
-- "constraint": ">=0.9"
-+ "constraint": ">=0.9 && <1.3.0"
-+ }
-+ ]
-+ },
-+ {
-+ "name": "RD_KAFKA_RESP_ERR_COORDINATOR_LOAD_IN_PROGRESS",
-+ "ext_min": "1.0.0",
-+ "php_min": "5.3.0",
-+ "dependencies": [
-+ {
-+ "name": "librdkafka",
-+ "constraint": ">=1.3.0RC1"
- }
- ]
- },
-@@ -959,7 +970,18 @@
- "dependencies": [
- {
- "name": "librdkafka",
-- "constraint": ">=0.9"
-+ "constraint": ">=0.9 && <1.3.0"
-+ }
-+ ]
-+ },
-+ {
-+ "name": "RD_KAFKA_RESP_ERR_COORDINATOR_NOT_AVAILABLE",
-+ "ext_min": "1.0.0",
-+ "php_min": "5.3.0",
-+ "dependencies": [
-+ {
-+ "name": "librdkafka",
-+ "constraint": ">=1.3.0RC1"
- }
- ]
- },
-@@ -970,7 +992,18 @@
- "dependencies": [
- {
- "name": "librdkafka",
-- "constraint": ">=0.9"
-+ "constraint": ">=0.9 && <1.3.0"
-+ }
-+ ]
-+ },
-+ {
-+ "name": "RD_KAFKA_RESP_ERR_NOT_COORDINATOR",
-+ "ext_min": "1.0.0",
-+ "php_min": "5.3.0",
-+ "dependencies": [
-+ {
-+ "name": "librdkafka",
-+ "constraint": ">=1.3.0RC1"
- }
- ]
- },
-diff --git a/data/reference/extension/rdkafka/6/releases.json b/data/reference/extension/rdkafka/6/releases.json
-index f2314a7f..bf2601d5 100644
---- a/data/reference/extension/rdkafka/6/releases.json
-+++ b/data/reference/extension/rdkafka/6/releases.json
-@@ -5,5 +5,12 @@
- "rel_state": "beta",
- "php_min": "7.0.0",
- "php_max": "8.99.99"
-+ },
-+ {
-+ "rel_version": "6.0.0RC2",
-+ "rel_date": "2021-11-27",
-+ "rel_state": "beta",
-+ "php_min": "7.0.0",
-+ "php_max": "8.99.99"
- }
- ]
-diff --git a/data/reference/extension/rdkafka/1/constants.json b/data/reference/extension/rdkafka/1/constants.json
-index f8adacab..3de391a3 100644
---- a/data/reference/extension/rdkafka/1/constants.json
-+++ b/data/reference/extension/rdkafka/1/constants.json
-@@ -948,7 +948,7 @@
- "dependencies": [
- {
- "name": "librdkafka",
-- "constraint": ">=0.9 && <1.3.0"
-+ "constraint": ">=0.9 <1.3.0"
- }
- ]
- },
-@@ -970,7 +970,7 @@
- "dependencies": [
- {
- "name": "librdkafka",
-- "constraint": ">=0.9 && <1.3.0"
-+ "constraint": ">=0.9 <1.3.0"
- }
- ]
- },
-@@ -992,7 +992,7 @@
- "dependencies": [
- {
- "name": "librdkafka",
-- "constraint": ">=0.9 && <1.3.0"
-+ "constraint": ">=0.9 <1.3.0"
- }
- ]
- },
diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index f5aa686..3164f46 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -49,7 +49,6 @@ Patch0: %{name}-3.16-rpm.patch
# - CURL_SSLVERSION constants
# - Phar::OPENSSL_SHA* constants
Patch1: %{name}-backports.patch
-Patch2: %{name}-up.patch
BuildArch: noarch
BuildRequires: php(language) >= 7.3
@@ -166,7 +165,6 @@ standard distribution and about 110 extensions.
%patch0 -p1 -b .rpm
%patch1 -p1 -b .backports
-%patch2 -p1 -b .up
: relocate
mv config src/config