From d6da84f7657f2d05f9da51dbf9e3a0558fac34db Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 4 Jul 2019 17:13:14 +0200
Subject: update to 2.5.0 (stable) raise dependency on PHP > 7

---
 PHPINFO             |  4 ++--
 php-pecl-solr2.spec | 39 +++++++++++----------------------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 106cdc9..6b84e79 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,5 +3,5 @@ solr
 
 Solr Support => enabled
 Version => 2.5.0
-Last Build Date => Jun 25 2019
-Last Build Time => 12:25:46
+Last Build Date => Jul  4 2019
+Last Build Time => 16:02:39
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec
index d9a9eb5..3beec23 100644
--- a/php-pecl-solr2.spec
+++ b/php-pecl-solr2.spec
@@ -18,13 +18,8 @@
 %global pecl_name solr
 #global prever    b
 %global with_zts  0%{!?_without_zts:%{?__ztsphp:1}}
-%if "%{php_version}" < "5.6"
-# After curl, json
-%global ini_name  %{pecl_name}.ini
-%else
 # After 20-curl, 40-json
 %global ini_name  50-%{pecl_name}.ini
-%endif
 # For full test (using localhost server) use --with tests
 # retrieve: docker pull omars/solr53
 # create:   docker run -d -p 8983:8983 --name solr5 -t omars/solr53
@@ -35,14 +30,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.5.0
-Release:        0%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        1%{?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
 
-BuildRequires:  %{?scl_prefix}php-devel
+BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-curl
 BuildRequires:  %{?scl_prefix}php-json
@@ -66,15 +61,9 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}2         = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release}
 %endif
-%if "%{php_version}" > "7.0"
 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}
-%else
-# Only one version of the extension
-Conflicts:      %{?sub_prefix}php-pecl-%{pecl_name}          < 2
-Conflicts:      %{?scl_prefix}php-pecl-%{pecl_name}          < 2
-%endif
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 %if "%{php_version}" > "7.1"
@@ -127,11 +116,8 @@ and provides built-in support for connecting to Solr servers secured behind
 HTTP Authentication or HTTP proxy servers. It is also able to connect to
 SSL-enabled containers.
 
-Please consult the documentation for more details on features.
-  http://php.net/solr
+Documentation: https://php.net/solr
 
-Warning: PECL Solr 2 is not compatible with Solr Server < 4.0
-PECL Solr 1 is available in php-pecl-solr package.
 
 Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
 
@@ -169,6 +155,8 @@ cp -r NTS ZTS
 
 
 %build
+%{?dtsenable}
+
 cd NTS
 %{_bindir}/phpize
 %configure  --with-php-config=%{_bindir}/php-config
@@ -183,6 +171,8 @@ make %{?_smp_mflags}
 
 
 %install
+%{?dtsenable}
+
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # Install XML package description
@@ -224,17 +214,6 @@ fi
 
 
 %check
-: Ignore test with jsonc before 1.3.9
-%{__php} -r '
-  $v=phpversion("json");
-  exit(version_compare($v,"1.3.0",">=") && version_compare($v,"1.3.9","<") ? 0 : 1);
-' && rm ?TS/tests/bug_67394.phpt
-
-: Ignore test with old PHP 5.3
-%if "%{php_version}" < "5.4"
-  rm ?TS/tests/151.solrcollapsefunction_illegal_operations.phpt
-%endif
-
 %if %{with_tests}
 sed -e '/SOLR_SERVER_CONFIGURED/s/false/true/' \
     -e '/SOLR_SERVER_HOSTNAME/s/solr.test/localhost/' \
@@ -294,6 +273,10 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
 
 
 %changelog
+* Thu Jul  4 2019 Remi Collet <remi@remirepo.net> - 2.5.0-1
+- update to 2.5.0 (stable)
+- raise dependency on PHP > 7
+
 * Tue Jun 25 2019 Remi Collet <remi@remirepo.net> - 2.5.0-0
 - test build for upcoming 2.5.0
 
-- 
cgit