From 46a0f949752b5a9172e47c27efff627a86e675b0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 9 Sep 2020 17:21:11 +0200
Subject: update to 2.5.1

---
 PHPINFO             |  2 +-
 REFLECTION          |  6 +++---
 php-pecl-solr2.spec | 13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 0dd3114..f28ca88 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,6 +2,6 @@
 solr
 
 Solr Support => enabled
-Version => 2.5.0
+Version => 2.5.1
 Last Build Date => Sep  9 2020
 Last Build Time => 00:00:00
diff --git a/REFLECTION b/REFLECTION
index 9088d8e..51d2c9a 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #117 solr version 2.5.0 ] {
+Extension [ <persistent> extension #117 solr version 2.5.1 ] {
 
   - Dependencies {
     Dependency [ libxml (Required) ]
@@ -8,8 +8,8 @@ Extension [ <persistent> extension #117 solr version 2.5.0 ] {
   - Constants [4] {
     Constant [ int SOLR_MAJOR_VERSION ] { 2 }
     Constant [ int SOLR_MINOR_VERSION ] { 5 }
-    Constant [ int SOLR_PATCH_VERSION ] { 0 }
-    Constant [ string SOLR_EXTENSION_VERSION ] { 2.5.0 }
+    Constant [ int SOLR_PATCH_VERSION ] { 1 }
+    Constant [ string SOLR_EXTENSION_VERSION ] { 2.5.1 }
   }
 
   - Functions {
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec
index e068a3f..dbd1523 100644
--- a/php-pecl-solr2.spec
+++ b/php-pecl-solr2.spec
@@ -30,7 +30,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.5.1
-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:            https://pecl.php.net/package/solr
@@ -117,13 +117,9 @@ sed -e 's/role="test"/role="src"/' \
 mv %{pecl_name}-%{version}%{?prever} NTS
 
 cd NTS
-# Check version
-if [ $(%{__php} -r 'echo PHP_MAJOR_VERSION;') < 7 ]; then
-  DIR=src/php5
-else
-  DIR=src/php7
-fi
 
+: Check version
+DIR=src/php7
 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}.
@@ -260,6 +256,9 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
 
 
 %changelog
+* Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 2.5.1-1
+- update to 2.5.1
+
 * Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 2.5.1-0
 - test build for upcoming 2.5.1
 
-- 
cgit