diff options
Diffstat (limited to 'php-pecl-solr2.spec')
| -rw-r--r-- | php-pecl-solr2.spec | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index 3c6db55..d9a9eb5 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-2018 Remi Collet +# Copyright (c) 2011-2019 Remi Collet # Copyright (c) 2010 Johan Cwiklinski # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ @@ -34,19 +34,14 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr Name: %{?sub_prefix}php-pecl-solr2 -Version: 2.4.0 -Release: 12%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.5.0 +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 Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -Patch0: upstream.patch -Patch1: 0001-fix-Wimplicit-function-declaration.patch -Patch2: 0003-Fix-Wincompatible-pointer-types-with-7.3.patch -Patch3: 0005-fix-segfault-in-013.solrclient_getByIds.sh.patch - BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-curl @@ -82,16 +77,6 @@ Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 2 %endif %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php56w-pecl-%{pecl_name}2 <= %{version} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php70w-pecl-%{pecl_name}2 <= %{version} -%endif %if "%{php_version}" > "7.1" Obsoletes: php71u-pecl-%{pecl_name} <= %{version} Obsoletes: php71w-pecl-%{pecl_name} <= %{version} @@ -105,11 +90,17 @@ Obsoletes: php72u-pecl-%{pecl_name}2 <= %{version} Obsoletes: php72w-pecl-%{pecl_name}2 <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73-pecl-%{pecl_name} <= %{version} Obsoletes: php73w-pecl-%{pecl_name} <= %{version} -Obsoletes: php73u-pecl-%{pecl_name}2 <= %{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 %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -156,11 +147,6 @@ sed -e 's/role="test"/role="src"/' \ mv %{pecl_name}-%{version}%{?prever} NTS cd NTS -%patch0 -p1 -b .upstream -%patch1 -p1 -b .up1 -%patch2 -p1 -b .up2 -%patch3 -p1 -b .up3 - # Check version DIR=src/php$(%{__php} -r 'echo PHP_MAJOR_VERSION;') extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' $DIR/php_solr_version.h) @@ -308,6 +294,9 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Tue Jun 25 2019 Remi Collet <remi@remirepo.net> - 2.5.0-0 +- test build for upcoming 2.5.0 + * Thu Dec 13 2018 Remi Collet <remi@remirepo.net> - 2.4.0-12 - cleanup for EL-8 |