diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-12-21 10:05:37 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-12-21 10:05:37 +0100 |
| commit | cd03e963899c770aab3218b34d1274d7a0da3773 (patch) | |
| tree | 72fca815446d1c31cde9ac21f55e9ed6731c7c1f /php-pecl-redis.spec | |
| parent | 47a21c187b97f357da6e647850d76e647baa6b81 (diff) | |
php-pecl-redis: test build
Diffstat (limited to 'php-pecl-redis.spec')
| -rw-r--r-- | php-pecl-redis.spec | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/php-pecl-redis.spec b/php-pecl-redis.spec index 13b5908..f2dccd7 100644 --- a/php-pecl-redis.spec +++ b/php-pecl-redis.spec @@ -18,7 +18,7 @@ %global pecl_name redis %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global with_tests 0%{?_with_tests:1} +%global with_tests 1%{?_with_tests:1} %global with_igbin 1 %if "%{php_version}" < "5.6" # after igbinary @@ -30,17 +30,13 @@ Summary: Extension for communicating with the Redis key-value store Name: %{?sub_prefix}php-pecl-redis -Version: 3.1.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 3.1.1 +Release: 0%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP Group: Development/Languages URL: http://pecl.php.net/package/redis -Patch0: %{pecl_name}-pr1057.patch -Patch1: %{pecl_name}-pr1063.patch -Patch2: %{pecl_name}-pr1064.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -122,9 +118,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr1057 -%patch1 -p1 -b .pr1063 -%patch2 -p1 -b .pr1064 # Sanity check, really often broken extver=$(sed -n '/#define PHP_REDIS_VERSION/{s/.* "//;s/".*$//;p}' php_redis.h) @@ -240,17 +233,7 @@ cd NTS/tests # Launch redis server mkdir -p data pidfile=$PWD/redis.pid -# port number to allow 32/64 build at same time -# and avoid conflict with a possible running server -%if 0%{?__isa_bits} -port=$(expr %{__isa_bits} + 6350) -%else -%ifarch x86_64 -port=6414 -%else -port=6382 -%endif -%endif +port=$(%{__php} -r 'echo 9000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE;') %{_root_bindir}/redis-server \ --bind 127.0.0.1 \ --port $port \ @@ -275,8 +258,7 @@ if [ -f $pidfile ]; then %{_root_bindir}/redis-cli -p $port shutdown fi -exit $ret - +#exit $ret %else : Upstream test suite disabled %endif @@ -322,6 +304,9 @@ rm -rf %{buildroot} %changelog +* 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 |