From f738e64f2ae1b3f93d847c098099ed72674d29b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Sep 2020 12:08:35 +0200 Subject: test build for upcoming 2.5.1 --- php-pecl-solr2.spec | 62 ++++++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 36 deletions(-) (limited to 'php-pecl-solr2.spec') diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index 72a4654..e068a3f 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-solr2 # -# Copyright (c) 2011-2019 Remi Collet +# Copyright (c) 2011-2020 Remi Collet # Copyright (c) 2010 Johan Cwiklinski # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ @@ -24,18 +24,18 @@ # retrieve: docker pull omars/solr53 # create: docker run -d -p 8983:8983 --name solr5 -t omars/solr53 # cleanup: docker stop solr5 && docker rm solr5 -%global with_tests 0%{?_with_tests:1} +%bcond_with tests Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr Name: %{?sub_prefix}php-pecl-solr2 -Version: 2.5.0 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.5.1 +Release: 0%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages -URL: http://pecl.php.net/package/solr +URL: https://pecl.php.net/package/solr -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear @@ -65,30 +65,14 @@ Obsoletes: %{?sub_prefix}php-pecl-%{pecl_name} < 2 Provides: %{?sub_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?sub_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -Obsoletes: php71u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php71w-pecl-%{pecl_name}2 <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -Obsoletes: php72u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php72w-pecl-%{pecl_name}2 <= %{version} -%endif +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} %if "%{php_version}" > "7.3" Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} Obsoletes: php73-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php73w-pecl-%{pecl_name}2 <= %{version} %endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} Obsoletes: php74-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php74w-pecl-%{pecl_name}2 <= %{version} %endif %endif @@ -134,11 +118,16 @@ mv %{pecl_name}-%{version}%{?prever} NTS cd NTS # Check version -DIR=src/php$(%{__php} -r 'echo PHP_MAJOR_VERSION;') +if [ $(%{__php} -r 'echo PHP_MAJOR_VERSION;') < 7 ]; then + DIR=src/php5 +else + DIR=src/php7 +fi + extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' $DIR/php_solr_version.h) if test "x${extver}" != "x%{version}%{?prever}"; then : Error: Upstream version is ${extver}, expecting %{version}%{?prever}. - exit 1 + #exit 1 fi cd .. @@ -214,7 +203,7 @@ fi %check -%if %{with_tests} +%if %{with tests} sed -e '/SOLR_SERVER_CONFIGURED/s/false/true/' \ -e '/SOLR_SERVER_HOSTNAME/s/solr.test/localhost/' \ -i ?TS/tests/test.config.inc @@ -223,17 +212,18 @@ sed -e '/SOLR_SERVER_CONFIGURED/s/true/false/' \ -i ?TS/tests/test.config.inc %endif +OPT="-n" +[ -f %{php_extdir}/curl.so ] && OPT="$OPT -d extension=curl.so" +[ -f %{php_extdir}/json.so ] && OPT="$OPT -d extension=json.so" + : Minimal load test for NTS installed extension -%{__php} \ - -n \ - -d extension=curl.so \ - -d extension=json.so \ +%{__php} $OPT \ -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ -m | grep %{pecl_name} : Upstream test suite for NTS extension cd NTS -TEST_PHP_ARGS="-n -d extension=curl.so -d extension=json.so -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ +TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__php} \ @@ -241,16 +231,13 @@ TEST_PHP_EXECUTABLE=%{__php} \ %if %{with_zts} : Minimal load test for ZTS installed extension -%{__ztsphp} \ - -n \ - -d extension=curl.so \ - -d extension=json.so \ +%{__ztsphp} $OPT \ -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ -m | grep %{pecl_name} : Upstream test suite for ZTS extension cd ../ZTS -TEST_PHP_ARGS="-n -d extension=curl.so -d extension=json.so -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ +TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__ztsphp} \ @@ -273,6 +260,9 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Wed Sep 9 2020 Remi Collet - 2.5.1-0 +- test build for upcoming 2.5.1 + * Tue Sep 03 2019 Remi Collet - 2.5.0-3 - rebuild for 7.4.0RC1 -- cgit