diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | 66.patch | 25 | ||||
| -rw-r--r-- | REFLECTION | 20 | ||||
| -rw-r--r-- | php-phpiredis.spec | 40 |
4 files changed, 32 insertions, 62 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..01f0400 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +clog +package-*.xml +*.tgz +*.tar.bz2 +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/66.patch b/66.patch deleted file mode 100644 index 7d7b117..0000000 --- a/66.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 488ea66312bd392eb890cf276529940abb91ae06 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 24 Aug 2020 10:32:53 +0200 -Subject: [PATCH] fix for upcoming PHP 8 - ---- - phpiredis.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/phpiredis.c b/phpiredis.c -index 952724a..2665fee 100644 ---- a/phpiredis.c -+++ b/phpiredis.c -@@ -28,6 +28,11 @@ int le_redis_persistent_context; - typedef long zend_long; - #endif - -+#ifndef TSRMLS_CC -+#define TSRMLS_CC -+#define TSRMLS_DC -+#endif -+ - typedef struct callback { - #ifdef ZEND_ENGINE_3 - zval function; @@ -1,15 +1,15 @@ -Extension [ <persistent> extension #108 phpiredis version 1.0.0 ] { +Extension [ <persistent> extension #92 phpiredis version 1.0.1 ] { - Constants [9] { - Constant [ integer PHPIREDIS_READER_STATE_INCOMPLETE ] { 2 } - Constant [ integer PHPIREDIS_READER_STATE_COMPLETE ] { 1 } - Constant [ integer PHPIREDIS_READER_STATE_ERROR ] { 3 } - Constant [ integer PHPIREDIS_REPLY_STRING ] { 1 } - Constant [ integer PHPIREDIS_REPLY_ARRAY ] { 2 } - Constant [ integer PHPIREDIS_REPLY_INTEGER ] { 3 } - Constant [ integer PHPIREDIS_REPLY_NIL ] { 4 } - Constant [ integer PHPIREDIS_REPLY_STATUS ] { 5 } - Constant [ integer PHPIREDIS_REPLY_ERROR ] { 6 } + Constant [ int PHPIREDIS_READER_STATE_INCOMPLETE ] { 2 } + Constant [ int PHPIREDIS_READER_STATE_COMPLETE ] { 1 } + Constant [ int PHPIREDIS_READER_STATE_ERROR ] { 3 } + Constant [ int PHPIREDIS_REPLY_STRING ] { 1 } + Constant [ int PHPIREDIS_REPLY_ARRAY ] { 2 } + Constant [ int PHPIREDIS_REPLY_INTEGER ] { 3 } + Constant [ int PHPIREDIS_REPLY_NIL ] { 4 } + Constant [ int PHPIREDIS_REPLY_STATUS ] { 5 } + Constant [ int PHPIREDIS_REPLY_ERROR ] { 6 } } - Functions { diff --git a/php-phpiredis.spec b/php-phpiredis.spec index dac5da2..734dfa0 100644 --- a/php-phpiredis.spec +++ b/php-phpiredis.spec @@ -11,7 +11,9 @@ %scl_package php-phpiredis %endif -%global gh_commit 981d455034a48bb19db39c578e9c16d889289b99 +%bcond_without tests + +%global gh_commit 4b6e81fc73b9473123a353c7c71112bf66a420ae %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nrk %global gh_project phpiredis @@ -25,19 +27,13 @@ %else %global ini_name 40-%{pecl_name}.ini %endif -%if 0%{?rhel} == 8 -# Temporarily disable as redis required -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -%endif Name: %{?sub_prefix}php-%{pecl_name} -Version: 1.0.0 +Version: 1.0.1 %if 0%{?gh_date} -Release: 0.7.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 19%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif Summary: Client extension for Redis @@ -46,14 +42,12 @@ License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/nrk/phpiredis/pull/66.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear # ensure we use hiredis-last when exists BuildRequires: hiredis-devel >= 0.13.3 -%if %{with_tests} +%if %{with tests} BuildRequires: redis # Workaround BuildRequires: jemalloc @@ -70,23 +64,13 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff -%if "%{php_version}" > "7.2" -Obsoletes: php72u-%{pecl_name} <= %{version} -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.3" Obsoletes: php73-%{pecl_name} <= %{version} Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" Obsoletes: php74-%{pecl_name} <= %{version} Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "8.0" Obsoletes: php80-%{pecl_name} <= %{version} @@ -102,7 +86,7 @@ Obsoletes: php80-pecl-%{pecl_name} <= %{version} %description -Phpiredis is an extension for PHP 5.x and 7.x based on hiredis +Phpiredis is an extension for PHP based on hiredis that provides a simple and efficient client for Redis and a fast incremental parser / serializer for the RESP protocol. @@ -114,8 +98,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{gh_project}-%{gh_commit} NTS cd NTS -%patch0 -p1 -b .pr66 - # Check extension version ver=$(sed -n '/define PHP_PHPIREDIS_VERSION/{s/.* "//;s/".*$//;p}' php_phpiredis.h) if test "$ver" != "%{version}%{?prever}%{?gh_date:-dev}"; then @@ -179,7 +161,7 @@ install -Dpm 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} --modules | grep %{pecl_name} %endif -%if %{with_tests} +%if %{with tests} : Upstream test suite for NTS extension pidfile=$PWD/redis.pid port=$(%{__php} -r 'echo 9000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE;') @@ -237,6 +219,10 @@ exit $ret %changelog +* Mon Sep 21 2020 Remi Collet <remi@remirepo.net> - 1.0.1-1 +- update to 1.0.1 +- drop patch marged upstream + * Wed Sep 2 2020 Remi Collet <remi@remirepo.net> - 1.0.0-19 - rebuild for PHP 8.0.0beta3 |