dup v5

2 files changed, 20 insertions, 790 deletions

diff --git a/php-pecl-redis5.spec b/php-pecl-redis5.spec
deleted file mode 100644
index de359c4..0000000
--- a/php-pecl-redis5.spec
+++ /dev/null
@@ -1,769 +0,0 @@
-# remirepo spec file for php-pecl-redis5
-#
-# Copyright (c) 2012-2023 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
-#
-# Please, preserve the changelog entries
-#
-
-# we don't want -z defs linker flag
-%undefine _strict_symbol_defs_build
-
-%if 0%{?scl:1}
-%scl_package       php-pecl-redis
-%else
-%global _root_bindir %{_bindir}
-%endif
-
-%global pecl_name   redis
-%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
-%bcond_without      tests
-%bcond_without      igbinary
-%bcond_without      msgpack
-# after 20-json, 40-igbinary and 40-msgpack
-%global ini_name    50-%{pecl_name}.ini
-
-%global upstream_version 5.3.7
-#global upstream_prever  RC2
-%global sources     %{pecl_name}-%{upstream_version}%{?upstream_prever}
-%global _configure  ../%{sources}/configure
-
-Summary:       Extension for communicating with the Redis key-value store
-Name:          %{?scl_prefix}php-pecl-redis5
-Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:       4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License:       PHP-3.01
-URL:           https://pecl.php.net/package/redis
-Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
-
-Patch0:        %{pecl_name}-tests.patch
-
-BuildRequires: make
-BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel >= 7.0
-BuildRequires: %{?scl_prefix}php-pear
-BuildRequires: %{?scl_prefix}php-json
-%if %{with igbinary}
-BuildRequires: %{?scl_prefix}php-pecl-igbinary-devel
-%endif
-%if %{with msgpack}
-BuildRequires: %{?scl_prefix}php-pecl-msgpack-devel >= 2.0.3
-%endif
-BuildRequires: pkgconfig(liblzf)
-BuildRequires: pkgconfig(libzstd) >= 1.3.0
-BuildRequires: pkgconfig(liblz4)
-# to run Test suite
-%if %{with tests}
-BuildRequires: redis >= 6
-%endif
-
-Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires:      %{?scl_prefix}php(api) = %{php_core_api}
-Requires:      %{?scl_prefix}php-json%{?_isa}
-%if %{with igbinary}
-Requires:      %{?scl_prefix}php-igbinary%{?_isa}
-%endif
-%if %{with msgpack}
-Requires:      %{?scl_prefix}php-msgpack%{?_isa}
-%endif
-
-Obsoletes:     %{?scl_prefix}php-%{pecl_name}               < 3
-Provides:      %{?scl_prefix}php-%{pecl_name}               = %{version}
-Provides:      %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
-Provides:      %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
-Provides:      %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 || "%{php_version}" > "7.4"
-Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}          < 5
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}4         < 5
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}4         = %{version}-%{release}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}4%{?_isa} = %{version}-%{release}
-%else
-# A single version can be installed
-Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}  < 5
-Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}4 < 5
-%endif
-
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7
-# Other third party repo stuff
-%if "%{php_version}" > "7.1"
-Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.2"
-Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.3"
-Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
-
-
-%description
-The phpredis extension provides an API for communicating
-with the Redis key-value store.
-
-This Redis client implements most of the latest Redis API.
-As method only only works when also implemented on the server side,
-some doesn't work with an old redis server version.
-
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
-
-
-%prep
-%setup -q -c
-
-# Don't install/register tests, license, and bundled library
-sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/COPYING/s/role="doc"/role="src"/' } \
-    -e '/liblzf/d' \
-    -i package.xml
-
-cd %{sources}
-%patch -P0 -p1 -b.pr2335
-
-# Use system library
-rm -r liblzf
-
-# Sanity check, really often broken
-extver=$(sed -n '/#define PHP_REDIS_VERSION/{s/.* "//;s/".*$//;p}' php_redis.h)
-if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
-   exit 1
-fi
-cd ..
-
-mkdir NTS
-%if %{with_zts}
-mkdir ZTS
-%endif
-
-# Drop in the bit of configuration
-cat > %{ini_name} << 'EOF'
-; Enable %{pecl_name} extension module
-extension = %{pecl_name}.so
-
-; phpredis can be used to store PHP sessions. 
-; To do this, uncomment and configure below
-
-; RPM note : save_handler and save_path are defined
-; for mod_php, in /etc/httpd/conf.d/php.conf
-; for php-fpm, in %{_sysconfdir}/php-fpm.d/*conf
-
-;session.save_handler = %{pecl_name}
-;session.save_path = "tcp://host1:6379?weight=1, tcp://host2:6379?weight=2&timeout=2.5, tcp://host3:6379?weight=2"
-
-; Configuration
-;redis.arrays.algorithm = ''
-;redis.arrays.auth = ''
-;redis.arrays.autorehash = 0
-;redis.arrays.connecttimeout = 0
-;redis.arrays.consistent = 0
-;redis.arrays.distributor = ''
-;redis.arrays.functions = ''
-;redis.arrays.hosts = ''
-;redis.arrays.index = 0
-;redis.arrays.lazyconnect = 0
-;redis.arrays.names = ''
-;redis.arrays.pconnect = 0
-;redis.arrays.previous = ''
-;redis.arrays.readtimeout = 0
-;redis.arrays.retryinterval = 0
-;redis.clusters.auth = 0
-;redis.clusters.cache_slots = 0
-;redis.clusters.persistent = 0
-;redis.clusters.read_timeout = 0
-;redis.clusters.seeds = ''
-;redis.clusters.timeout = 0
-;redis.pconnect.pooling_enabled = 1
-;redis.pconnect.connection_limit = 0
-;redis.pconnect.echo_check_liveness = 1
-;redis.pconnect.pool_detect_dirty = 0
-;redis.pconnect.pool_poll_timeout = 0
-;redis.pconnect.pool_pattern => ''
-;redis.session.lock_expire = 0
-;redis.session.lock_retries = 10
-;redis.session.lock_wait_time = 2000
-;redis.session.locking_enabled = 0
-EOF
-
-
-%build
-%{?dtsenable}
-
-peclconf() {
-%configure \
-    --enable-redis \
-    --enable-redis-session \
-%if %{with igbinary}
-    --enable-redis-igbinary \
-%endif
-%if %{with msgpack}
-    --enable-redis-msgpack \
-%endif
-    --enable-redis-lzf \
-    --with-liblzf \
-    --enable-redis-zstd \
-    --with-libzstd \
-    --enable-redis-lz4 \
-    --with-liblz4 \
-    --with-php-config=$1
-}
-
-cd %{sources}
-%{__phpize}
-
-cd ../NTS
-peclconf %{__phpconfig}
-make %{?_smp_mflags}
-
-%if %{with_zts}
-cd ../ZTS
-peclconf %{__ztsphpconfig}
-make %{?_smp_mflags}
-%endif
-
-
-%install
-%{?dtsenable}
-
-# Install the NTS stuff
-make -C NTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-
-%if %{with_zts}
-# Install the ZTS stuff
-make -C ZTS install INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
-%endif
-
-# Install the package XML file
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-# Documentation
-cd %{sources}
-for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
-
-%check
-# simple module load test
-DEPS="--no-php-ini"
-%if "%{php_version}" < "8.0"
-DEPS="$DEPS --define extension=json.so"
-%endif
-%if %{with igbinary}
-DEPS="$DEPS --define extension=igbinary.so"
-%endif
-%if %{with msgpack}
-DEPS="$DEPS --define extension=msgpack.so"
-%endif
-
-%{__php} $DEPS \
-    --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-    --modules | grep '^%{pecl_name}$'
-
-%if %{with_zts}
-%{__ztsphp} $DEPS \
-    --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
-    --modules | grep '^%{pecl_name}$'
-%endif
-
-%if %{with tests}
-cd %{sources}/tests
-
-: Launch redis server
-mkdir -p data
-pidfile=$PWD/redis.pid
-port=$(%{__php} -r 'echo 9000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE + 0%{?scl:1};')
-%{_root_bindir}/redis-server   \
-    --bind      127.0.0.1      \
-    --port      $port          \
-    --daemonize yes            \
-    --logfile   $PWD/redis.log \
-    --dir       $PWD/data      \
-    --pidfile   $pidfile
-
-
-: Run the test Suite
-sed -e "s/6379/$port/" -i *.php
-
-ret=0
-export TEST_PHP_EXECUTABLE=%{__php}
-export TEST_PHP_ARGS="$DEPS \
-    --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so"
-$TEST_PHP_EXECUTABLE $TEST_PHP_ARGS TestRedis.php || ret=1
-
-: Cleanup
-if [ -f $pidfile ]; then
-   %{_root_bindir}/redis-cli -p $port shutdown nosave
-   sleep 2
-fi
-cat $PWD/redis.log
-
-exit $ret
-%else
-: Upstream test suite disabled
-%endif
-
-
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
-%files
-%{?_licensedir:%license %{sources}/COPYING}
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
-
-%{php_extdir}/%{pecl_name}.so
-%config(noreplace) %{php_inidir}/%{ini_name}
-
-%if %{with_zts}
-%{php_ztsextdir}/%{pecl_name}.so
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%endif
-
-
-%changelog
-* Wed Jul 12 2023 Remi Collet <remi@remirepo.net> - 5.3.7-4
-- build out of sources tree
-
-* Thu Mar 23 2023 Remi Collet <remi@remirepo.net> - 5.3.7-3
-- add patch for test suite with redis 7.2 from
-  https://github.com/phpredis/phpredis/pull/2335
-
-* Fri Sep  9 2022 Remi Collet <remi@remirepo.net> - 5.3.7-2
-- rebuild for PHP 8.2 with msgpack and igbinary
-
-* Wed Feb 16 2022 Remi Collet <remi@remirepo.net> - 5.3.7-1
-- update to 5.3.7
-
-* Mon Feb 14 2022 Remi Collet <remi@remirepo.net> - 5.3.7~RC2-1
-- update to 5.3.7RC2 (beta, no change)
-
-* Wed Feb  2 2022 Remi Collet <remi@remirepo.net> - 5.3.7~RC1-1
-- update to 5.3.7RC1 (alpha)
-
-* Tue Jan 18 2022 Remi Collet <remi@remirepo.net> - 5.3.6-1
-- update to 5.3.6
-
-* Mon Dec 20 2021 Remi Collet <remi@remirepo.net> - 5.3.5-1
-- update to 5.3.5
-
-* Wed Dec  8 2021 Remi Collet <remi@remirepo.net> - 5.3.5-0
-- test build for upcoming 5.3.5
-
-* Wed Nov 17 2021 Remi Collet <remi@remirepo.net> - 5.3.5~RC1-1
-- update to 5.3.5RC1
-
-* Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 5.3.4-2
-- rebuild for 8.1.0RC1
-
-* Thu Mar 25 2021 Remi Collet <remi@remirepo.net> - 5.3.4-1
-- update to 5.3.4
-
-* Wed Feb  3 2021 Remi Collet <remi@remirepo.net> - 5.3.3-1
-- update to 5.3.3
-
-* Thu Oct 22 2020 Remi Collet <remi@remirepo.net> - 5.3.2-1
-- update to 5.3.2
-
-* Wed Oct 14 2020 Remi Collet <remi@remirepo.net> - 5.3.2~RC2-1
-- update to 5.3.2RC2
-
-* Wed Oct  7 2020 Remi Collet <remi@remirepo.net> - 5.3.2~RC1-1
-- update to 5.3.2RC1
-- drop patch merged upstream
-
-* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 5.3.1-4
-- rebuild for PHP 8.0.0RC1
-
-* Wed Sep 23 2020 Remi Collet <remi@remirepo.net> - 5.3.1-3
-- enable msgpack serializer with PHP 8
-
-* Fri Sep 11 2020 Remi Collet <remi@remirepo.net> - 5.3.1-2
-- add patches for PHP 8 from upstream and
-  https://github.com/phpredis/phpredis/pull/1845
-- disable msgpack serializer with PHP 8
-
-* Wed Jul  8 2020 Remi Collet <remi@remirepo.net> - 5.3.1-1
-- update to 5.3.1
-
-* Wed Jul  1 2020 Remi Collet <remi@remirepo.net> - 5.3.0-1
-- update to 5.3.0
-
-* Sat Jun 27 2020 Remi Collet <remi@remirepo.net> - 5.3.0~RC2-1
-- update to 5.3.0RC2
-- drop patch merged upstream
-
-* Fri Jun 26 2020 Remi Collet <remi@remirepo.net> - 5.3.0~RC1-1
-- update to 5.3.0RC1
-- enable lz4 compression support
-- drop patch merged upstream
-- add upstream patch to fix lz4 library name
-- add new option in provided configuration file
-
-* Wed May  6 2020 Remi Collet <remi@remirepo.net> - 5.2.2-2
-- test build for https://github.com/phpredis/phpredis/pull/1750
-
-* Wed May  6 2020 Remi Collet <remi@remirepo.net> - 5.2.2-1
-- update to 5.2.2
-- refresh options in provided configuration file
-
-* Fri Mar 20 2020 Remi Collet <remi@remirepo.net> - 5.2.1-1
-- update to 5.2.1
-
-* Mon Mar  2 2020 Remi Collet <remi@remirepo.net> - 5.2.0-1
-- update to 5.2.0
-
-* Fri Feb 21 2020 Remi Collet <remi@remirepo.net> - 5.2.0~RC2-1
-- update to 5.2.0RC2
-
-* Mon Feb 17 2020 Remi Collet <remi@remirepo.net> - 5.2.0~RC1-1
-- update to 5.2.0RC1
-
-* Mon Nov 11 2019 Remi Collet <remi@remirepo.net> - 5.1.1-1
-- update to 5.1.1
-
-* Fri Nov  1 2019 Remi Collet <remi@remirepo.net> - 5.1.0-1
-- update to 5.1.0
-
-* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 5.1.0~RC2-1
-- update to 5.1.0RC2
-- drop patch merged upstream
-
-* Wed Oct  9 2019 Remi Collet <remi@remirepo.net> - 5.1.0~RC1-1
-- update to 5.1.0RC1
-- enable ZSTD compression support
-- open https://github.com/phpredis/phpredis/pull/1648
-
-* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 5.0.2-2
-- rebuild for 7.4.0RC1
-
-* Tue Jul 30 2019 Remi Collet <remi@remirepo.net> - 5.0.2-1
-- update to 5.0.2
-
-* Tue Jul 23 2019 Remi Collet <remi@remirepo.net> - 5.0.1-2
-- rebuild for 7.4.0beta1
-
-* Fri Jul 12 2019 Remi Collet <remi@remirepo.net> - 5.0.1-1
-- update to 5.0.1
-
-* Tue Jul  2 2019 Remi Collet <remi@remirepo.net> - 5.0.0-1
-- update to 5.0.0
-
-* Wed Jun 26 2019 Remi Collet <remi@remirepo.net> - 5.0.0~RC2-1
-- update to 5.0.0RC2
-
-* Thu Jun 20 2019 Remi Collet <remi@remirepo.net> - 5.0.0~RC1-1
-- update to 5.0.0RC1
-- rename to php-pecl-redis5
-- raise dependency on PHP 7
-- enable msgpack support
-- enable json support
-- update configuration for new options
-- open https://github.com/phpredis/phpredis/pull/1578
-  fix extension dependencies and report about json serializer
-
-* Wed May 29 2019 Remi Collet <remi@remirepo.net> - 4.3.0-3
-- rebuild
-
-* Wed May 22 2019 Remi Collet <remi@remirepo.net> - 4.3.0-2
-- cleanup
-
-* Thu Mar 14 2019 Remi Collet <remi@remirepo.net> - 4.3.0-1
-- update to 4.3.0 (stable)
-
-* Wed Mar  6 2019 Remi Collet <remi@remirepo.net> - 4.3.0~RC2-1
-- update to 4.3.0RC2 (beta)
-
-* Mon Feb 25 2019 Remi Collet <remi@remirepo.net> - 4.3.0~RC1-1
-- update to 4.3.0RC1 (alpha)
-  no change sincy 4.2.1RC1, only version change according to semver
-  see https://github.com/phpredis/phpredis/issues/1517
-
-* Mon Feb 25 2019 Remi Collet <remi@remirepo.net> - 4.2.1~RC1-1
-- update to 4.2.1RC1 (alpha)
-- update provided configuration with new runtime option
-
-* Tue Dec 11 2018 Remi Collet <remi@remirepo.net> - 4.2.0-3
-- test build for upstream patch
-
-* Tue Dec  4 2018 Remi Collet <remi@remirepo.net> - 4.2.0-2
-- open https://github.com/phpredis/phpredis/issues/1472
-  tests failing with redis 5.0.2
-
-* Sun Nov 18 2018 Remi Collet <remi@remirepo.net> - 4.2.0-1
-- update to 4.2.0 (stable)
-
-* Fri Nov  9 2018 Remi Collet <remi@remirepo.net> - 4.2.0~RC3-1
-- update to 4.2.0RC3 (beta)
-
-* Wed Nov  7 2018 Remi Collet <remi@remirepo.net> - 4.2.0~RC2-2
-- test build for https://github.com/phpredis/phpredis/pull/1444
-
-* Fri Oct 26 2018 Remi Collet <remi@remirepo.net> - 4.2.0~RC2-1
-- update to 4.2.0RC2 (beta)
-- open https://github.com/phpredis/phpredis/issues/1437 32-bit failed test
-
-* Sun Oct 21 2018 Remi Collet <remi@remirepo.net> - 4.2.0~RC1-2
-- test build with upstream patches
-
-* Fri Oct 12 2018 Remi Collet <remi@remirepo.net> - 4.2.0~RC1-1
-- update to 4.2.0RC1 (alpha)
-
-* Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 4.1.1-2
-- rebuild for 7.3.0beta2 new ABI
-
-* Sun Aug  5 2018 Remi Collet <remi@remirepo.net> - 4.1.1-1
-- update to 4.1.1
-
-* Tue Jul 17 2018 Remi Collet <remi@remirepo.net> - 4.1.0-2
-- rebuld for 7.3.0alpha4 new ABI
-
-* Tue Jul 10 2018 Remi Collet <remi@remirepo.net> - 4.1.0-1
-- update to 4.1.0 (stable)
-
-* Fri Jun 22 2018 Remi Collet <remi@remirepo.net> - 4.1.0~RC3-1
-- update to 4.1.0RC3 (beta, no change)
-- drop patches merged upstream
-
-* Fri Jun  8 2018 Remi Collet <remi@remirepo.net> - 4.1.0~RC1-2
-- test build with 7.3
-- open https://github.com/phpredis/phpredis/pull/1366
-  Fix: Warning: time() expects exactly 0 parameters, 1 given ...
-
-* Fri Jun  8 2018 Remi Collet <remi@remirepo.net> - 4.1.0~RC1-1
-- update to 4.1.0RC1 (alpha)
-- open https://github.com/phpredis/phpredis/pull/1365
-  use PHP_BINARY instead of php and allow override
-- report https://github.com/phpredis/phpredis/issues/1364
-  missing files in pecl archive
-- add new redis.session.lock* options in provided configuration
-
-* Wed Apr 25 2018 Remi Collet <remi@remirepo.net> - 4.0.2-1
-- update to 4.0.2
-
-* Wed Apr 18 2018 Remi Collet <remi@remirepo.net> - 4.0.1-1
-- update to 4.0.1
-
-* Mon Mar 19 2018 Remi Collet <remi@remirepo.net> - 4.0.0-1
-- update to 4.0.0 (stable)
-
-* Sat Mar  3 2018 Remi Collet <remi@remirepo.net> - 4.0.0~RC2-1
-- update to 4.0.0RC2
-
-* Wed Feb  7 2018 Remi Collet <remi@remirepo.net> - 4.0.0~RC1-4
-- re-enable s390x build (was a temporary failure)
-
-* Wed Feb  7 2018 Remi Collet <remi@remirepo.net> - 4.0.0~RC1-3
-- add patch to skip online test from
-  https://github.com/phpredis/phpredis/pull/1304
-- exclude s390x arch reported as
-  https://github.com/phpredis/phpredis/issues/1305
-
-* Wed Feb  7 2018 Remi Collet <remi@remirepo.net> - 4.0.0~RC1-1
-- update to 4.0.0RC1
-- rename to php-pecl-redis4
-- enable lzf support
-- update configuration for new options
-
-* Wed Jan  3 2018 Remi Collet <remi@remirepo.net> - 3.1.6-1
-- Update to 3.1.6
-
-* Thu Dec 21 2017 Remi Collet <remi@remirepo.net> - 3.1.5-1
-- update to 3.1.5 (stable)
-
-* Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 3.1.5~RC2-1
-- update to 3.1.5RC2 (beta)
-
-* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 3.1.5~RC1-1
-- update to 3.1.5RC1 (beta)
-
-* Sun Nov  5 2017 Remi Collet <remi@remirepo.net> - 3.1.4-3
-- add upstream patch, fix segfault with PHP 5.x
-
-* Tue Oct 17 2017 Remi Collet <remi@remirepo.net> - 3.1.4-2
-- rebuild
-
-* Wed Sep 27 2017 Remi Collet <remi@remirepo.net> - 3.1.4-1
-- update to 3.1.4 (stable)
-
-* Wed Sep 13 2017 Remi Collet <remi@remirepo.net> - 3.1.4~RC3-1
-- update to 3.1.4RC3 (beta)
-
-* Wed Sep 13 2017 Remi Collet <remi@remirepo.net> - 3.1.4~RC2-1
-- update to 3.1.4RC2 (beta)
-- open https://github.com/phpredis/phpredis/issues/1236
-  unwanted noise (warning) not even using the extension
-
-* Mon Sep  4 2017 Remi Collet <remi@remirepo.net> - 3.1.4~RC1-1
-- update to 3.1.4RC1 (beta)
-
-* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 3.1.3-2
-- rebuild for PHP 7.2.0beta1 new API
-
-* Mon Jul 17 2017 Remi Collet <remi@remirepo.net> - 3.1.3-1
-- update to 3.1.3 (stable)
-
-* Tue Jun 27 2017 Remi Collet <remi@remirepo.net> - 3.1.3~RC2-1
-- update to 3.1.3RC2 (beta)
-
-* Wed Jun 21 2017 Remi Collet <remi@remirepo.net> - 3.1.3~RC1-2
-- rebuild for 7.2.0alpha2
-
-* Thu Jun  1 2017 Remi Collet <remi@remirepo.net> - 3.1.3~RC1-1
-- update to 3.1.3RC1 (beta)
-
-* Sat Mar 25 2017 Remi Collet <remi@remirepo.net> - 3.1.2-1
-- Update to 3.1.2 (stable)
-
-* Wed Feb  1 2017 Remi Collet <remi@fedoraproject.org> - 3.1.1-1
-- Update to 3.1.1 (stable)
-
-* Tue Jan 17 2017 Remi Collet <remi@fedoraproject.org> - 3.1.1-0.2.RC2
-- Update to 3.1.1RC2
-
-* Thu Dec 22 2016 Remi Collet <remi@fedoraproject.org> - 3.1.1-0.1.RC1
-- test build for open upcoming 3.1.1RC1
-
-* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 3.1.1-0
-- test build for open upcoming 3.1.1
-
-* Thu Dec 15 2016 Remi Collet <remi@fedoraproject.org> - 3.1.0-2
-- test build for open upcoming 3.1.1
-- open https://github.com/phpredis/phpredis/issues/1060 broken impl
-  with https://github.com/phpredis/phpredis/pull/1064
-- reed https://github.com/phpredis/phpredis/issues/1062 session php 7.1
-  with https://github.com/phpredis/phpredis/pull/1063
-
-* Thu Dec 15 2016 Remi Collet <remi@fedoraproject.org> - 3.1.0-1
-- update to 3.1.0
-- open https://github.com/phpredis/phpredis/issues/1052 max version
-- open https://github.com/phpredis/phpredis/issues/1053 segfault
-- open https://github.com/phpredis/phpredis/issues/1054 warnings
-- open https://github.com/phpredis/phpredis/issues/1055 reflection
-- open https://github.com/phpredis/phpredis/issues/1056 32bits tests
-
-* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-3
-- rebuild with PHP 7.1.0 GA
-
-* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-2
-- rebuild for PHP 7.1 new API version
-
-* Sat Jun 11 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
-- Update to 3.0.0 (stable)
-
-* Thu Jun  9 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.1.20160603git6447940
-- refresh and bump version
-
-* Thu May  5 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.6.20160504gitad3c116
-- refresh
-
-* Thu Mar  3 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.5.20160215git2887ad1
-- enable igbinary support
-
-* Fri Feb 19 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.4.20160215git2887ad1
-- refresh
-
-* Thu Feb 11 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.3.20160208git0d4b421
-- refresh
-
-* Tue Jan 26 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.2.20160125git7b36957
-- refresh
-
-* Sun Jan 10 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.2.20160106git4a37e47
-- improve package.xml, set stability=devel
-
-* Sun Jan 10 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.1.20160106git4a37e47
-- update to 2.2.8-dev for PHP 7
-- use git snapshot
-
-* Sat Jun 20 2015 Remi Collet <remi@fedoraproject.org> - 2.2.7-2
-- allow build against rh-php56 (as more-php56)
-
-* Tue Mar 03 2015 Remi Collet <remi@fedoraproject.org> - 2.2.7-1
-- Update to 2.2.7 (stable)
-- drop runtime dependency on pear, new scriptlets
-
-* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 2.2.5-5.1
-- Fedora 21 SCL mass rebuild
-
-* Fri Oct  3 2014 Remi Collet <rcollet@redhat.com> - 2.2.5-5
-- fix segfault with igbinary serializer
-  https://github.com/nicolasff/phpredis/issues/341
-
-* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 2.2.5-4
-- improve SCL build
-
-* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 2.2.5-3
-- add numerical prefix to extension configuration file (php 5.6)
-- add comment about session configuration
-
-* Thu Mar 20 2014 Remi Collet <rcollet@redhat.com> - 2.2.5-2
-- fix memory corruption with PHP 5.6
-  https://github.com/nicolasff/phpredis/pull/447
-
-* Wed Mar 19 2014 Remi Collet <remi@fedoraproject.org> - 2.2.5-1
-- Update to 2.2.5
-
-* Wed Mar 19 2014 Remi Collet <rcollet@redhat.com> - 2.2.4-3
-- allow SCL build
-
-* Fri Feb 28 2014 Remi Collet <remi@fedoraproject.org> - 2.2.4-2
-- cleaups
-- move doc in pecl_docdir
-
-* Mon Sep 09 2013 Remi Collet <remi@fedoraproject.org> - 2.2.4-1
-- Update to 2.2.4
-
-* Tue Apr 30 2013 Remi Collet <remi@fedoraproject.org> - 2.2.3-1
-- update to 2.2.3
-- upstream moved to pecl, rename from php-redis to php-pecl-redis
-
-* Tue Sep 11 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-5.git6f7087f
-- more docs and improved description
-
-* Sun Sep  2 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-4.git6f7087f
-- latest snahot (without bundled igbinary)
-- remove chmod (done upstream)
-
-* Sat Sep  1 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-3.git5df5153
-- run only test suite with redis > 2.4
-
-* Fri Aug 31 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-2.git5df5153
-- latest master
-- run test suite
-
-* Wed Aug 29 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-1
-- update to 2.2.2
-- enable ZTS build
-
-* Tue Aug 28 2012 Remi Collet <remi@fedoraproject.org> - 2.2.1-1
-- initial package
diff --git a/php-pecl-redis6.spec b/php-pecl-redis6.spec
index 19fd632..de359c4 100644
--- a/php-pecl-redis6.spec
+++ b/php-pecl-redis6.spec
@@ -1,4 +1,4 @@
-# remirepo spec file for php-pecl-redis6
+# remirepo spec file for php-pecl-redis5
 #
 # Copyright (c) 2012-2023 Remi Collet
 # License: CC-BY-SA-4.0
@@ -7,6 +7,9 @@
 # Please, preserve the changelog entries
 #
 
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
 %if 0%{?scl:1}
 %scl_package       php-pecl-redis
 %else
@@ -21,19 +24,21 @@
 # after 20-json, 40-igbinary and 40-msgpack
 %global ini_name    50-%{pecl_name}.ini
 
-%global upstream_version 6.0.0
-%global upstream_prever  RC1
+%global upstream_version 5.3.7
+#global upstream_prever  RC2
 %global sources     %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure  ../%{sources}/configure
 
 Summary:       Extension for communicating with the Redis key-value store
-Name:          %{?scl_prefix}php-pecl-redis6
+Name:          %{?scl_prefix}php-pecl-redis5
 Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       PHP-3.01
 URL:           https://pecl.php.net/package/redis
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
+Patch0:        %{pecl_name}-tests.patch
+
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -50,7 +55,7 @@ BuildRequires: pkgconfig(libzstd) >= 1.3.0
 BuildRequires: pkgconfig(liblz4)
 # to run Test suite
 %if %{with tests}
-BuildRequires: redis >= 7
+BuildRequires: redis >= 6
 %endif
 
 Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -69,21 +74,17 @@ Provides:      %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 Provides:      %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
 Provides:      %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 
-%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 || "%{php_version}" > "8.3"
-Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}          < 6
+%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 || "%{php_version}" > "7.4"
+Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}          < 5
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}4         < 6
+Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}4         < 5
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}4         = %{version}-%{release}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}4%{?_isa} = %{version}-%{release}
-Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}5         < 6
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}5         = %{version}-%{release}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}5%{?_isa} = %{version}-%{release}
 %else
 # A single version can be installed
-Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}  < 6
-Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}4 < 6
-Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}5 < 6
+Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}  < 5
+Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}4 < 5
 %endif
 
 %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7
@@ -122,11 +123,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 # Don't install/register tests, license, and bundled library
 sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    %{?_licensedir:-e '/COPYING/s/role="doc"/role="src"/' } \
     -e '/liblzf/d' \
     -i package.xml
 
 cd %{sources}
+%patch -P0 -p1 -b.pr2335
+
 # Use system library
 rm -r liblzf
 
@@ -334,7 +337,7 @@ fi
 
 
 %files
-%{?_licensedir:%license %{sources}/LICENSE}
+%{?_licensedir:%license %{sources}/COPYING}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -348,10 +351,6 @@ fi
 
 
 %changelog
-* Wed Aug  2 2023 Remi Collet <remi@remirepo.net> - 6.0.0~RC1-1
-- update to 6.0.0RC1
-- rename to php-pecl-redis6 for new API
-
 * Wed Jul 12 2023 Remi Collet <remi@remirepo.net> - 5.3.7-4
 - build out of sources tree