summaryrefslogtreecommitdiffstats
path: root/php-pecl-solr2.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-solr2.spec')
-rw-r--r--php-pecl-solr2.spec30
1 files changed, 19 insertions, 11 deletions
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec
index 5bdf488..381c5c6 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-2017 Remi Collet
+# Copyright (c) 2011-2018 Remi Collet
# Copyright (c) 2010 Johan Cwiklinski
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
@@ -35,7 +35,7 @@ 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: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/solr
@@ -43,6 +43,9 @@ 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
@@ -79,14 +82,6 @@ Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 2
%endif
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-Obsoletes: php53-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php53u-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php54-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php54w-pecl-%{pecl_name}2 <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes: php55u-pecl-%{pecl_name}2 <= %{version}
-Obsoletes: php55w-pecl-%{pecl_name}2 <= %{version}
-%endif
%if "%{php_version}" > "5.6"
Obsoletes: php56u-pecl-%{pecl_name}2 <= %{version}
Obsoletes: php56w-pecl-%{pecl_name}2 <= %{version}
@@ -109,6 +104,12 @@ Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
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: php73w-pecl-%{pecl_name} <= %{version}
+Obsoletes: php73u-pecl-%{pecl_name}2 <= %{version}
+Obsoletes: php73w-pecl-%{pecl_name}2 <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -156,6 +157,10 @@ 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)
@@ -246,7 +251,7 @@ fi
%if %{with_tests}
sed -e '/SOLR_SERVER_CONFIGURED/s/false/true/' \
- -e '/SOLR_SERVER_HOSTNAME/s/solr5/localhost/' \
+ -e '/SOLR_SERVER_HOSTNAME/s/solr.test/localhost/' \
-i ?TS/tests/test.config.inc
%else
sed -e '/SOLR_SERVER_CONFIGURED/s/true/false/' \
@@ -303,6 +308,9 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
%changelog
+* Fri Oct 12 2018 Remi Collet <remi@remirepo.net> - 2.4.0-11
+- add upstream patch for PHP 7.3
+
* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.4.0-5
- rebuild for PHP 7.2.0beta1 new API