update to 2.8.0HEADmaster

3 files changed, 29 insertions, 53 deletions

diff --git a/PHPINFO b/PHPINFO
index b478e97..50580b6 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,6 +2,6 @@
 solr
 
 Solr Support => enabled
-Version => 2.7.0
-Last Build Date => Jan 12 2024
+Version => 2.8.0
+Last Build Date => Dec 31 2024
 Last Build Time => 00:00:00
diff --git a/REFLECTION b/REFLECTION
index 43717ef..b5ed350 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #82 solr version 2.7.0 ] {
+Extension [ <persistent> extension #127 solr version 2.8.0 ] {
 
   - Dependencies {
     Dependency [ libxml (Required) ]
@@ -7,9 +7,9 @@ Extension [ <persistent> extension #82 solr version 2.7.0 ] {
 
   - Constants [4] {
     Constant [ int SOLR_MAJOR_VERSION ] { 2 }
-    Constant [ int SOLR_MINOR_VERSION ] { 7 }
+    Constant [ int SOLR_MINOR_VERSION ] { 8 }
     Constant [ int SOLR_PATCH_VERSION ] { 0 }
-    Constant [ string SOLR_EXTENSION_VERSION ] { 2.7.0 }
+    Constant [ string SOLR_EXTENSION_VERSION ] { 2.8.0 }
   }
 
   - Functions {
@@ -5023,7 +5023,7 @@ Extension [ <persistent> extension #82 solr version 2.7.0 ] {
         Property [ protected string $file = '' ]
         Property [ protected int $line = 0 ]
         Property [ protected $sourceline = 118 ]
-        Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.7.0/solr-2.7.0/src/php7/solr_functions_helpers.c' ]
+        Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.0-build/php-pecl-solr2-2.8.0/solr-2.8.0/src/solr_functions_helpers.c' ]
         Property [ protected $zif_name = 'solr_exception_register_class_properties' ]
       }
 
@@ -5124,7 +5124,7 @@ Extension [ <persistent> extension #82 solr version 2.7.0 ] {
         Property [ protected string $file = '' ]
         Property [ protected int $line = 0 ]
         Property [ protected $sourceline = 118 ]
-        Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.7.0/solr-2.7.0/src/php7/solr_functions_helpers.c' ]
+        Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.0-build/php-pecl-solr2-2.8.0/solr-2.8.0/src/solr_functions_helpers.c' ]
         Property [ protected $zif_name = 'solr_exception_register_class_properties' ]
       }
 
@@ -5225,7 +5225,7 @@ Extension [ <persistent> extension #82 solr version 2.7.0 ] {
         Property [ protected string $file = '' ]
         Property [ protected int $line = 0 ]
         Property [ protected $sourceline = 118 ]
-        Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.7.0/solr-2.7.0/src/php7/solr_functions_helpers.c' ]
+        Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.0-build/php-pecl-solr2-2.8.0/solr-2.8.0/src/solr_functions_helpers.c' ]
         Property [ protected $zif_name = 'solr_exception_register_class_properties' ]
       }
 
@@ -5326,7 +5326,7 @@ Extension [ <persistent> extension #82 solr version 2.7.0 ] {
         Property [ protected string $file = '' ]
         Property [ protected int $line = 0 ]
         Property [ protected $sourceline = 118 ]
-        Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.7.0/solr-2.7.0/src/php7/solr_functions_helpers.c' ]
+        Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.0-build/php-pecl-solr2-2.8.0/solr-2.8.0/src/solr_functions_helpers.c' ]
         Property [ protected $zif_name = 'solr_exception_register_class_properties' ]
       }
 
@@ -5427,7 +5427,7 @@ Extension [ <persistent> extension #82 solr version 2.7.0 ] {
         Property [ protected string $file = '' ]
         Property [ protected int $line = 0 ]
         Property [ protected $sourceline = 118 ]
-        Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.7.0/solr-2.7.0/src/php7/solr_functions_helpers.c' ]
+        Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.0-build/php-pecl-solr2-2.8.0/solr-2.8.0/src/solr_functions_helpers.c' ]
         Property [ protected $zif_name = 'solr_exception_register_class_properties' ]
       }
 
@@ -5528,7 +5528,7 @@ Extension [ <persistent> extension #82 solr version 2.7.0 ] {
         Property [ protected string $file = '' ]
         Property [ protected int $line = 0 ]
         Property [ protected $sourceline = 118 ]
-        Property [ protected $sourcefile = '/builddir/build/BUILD/php-pecl-solr2-2.7.0/solr-2.7.0/src/php7/solr_functions_helpers.c' ]
+        Property [ protected $sourcefile = '/dev/shm/BUILD/php-pecl-solr2-2.8.0-build/php-pecl-solr2-2.8.0/solr-2.8.0/src/solr_functions_helpers.c' ]
         Property [ protected $zif_name = 'solr_exception_register_class_properties' ]
       }
 
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec
index 8270554..3450db8 100644
--- a/php-pecl-solr2.spec
+++ b/php-pecl-solr2.spec
@@ -3,10 +3,9 @@
 #
 # Fedora spec file for php-pecl-solr2
 #
-# Copyright (c) 2011-2024 Remi Collet
-# Copyright (c) 2010 Johan Cwiklinski
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2011-2024 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
@@ -30,7 +29,7 @@
 Summary:        Object oriented API to Apache Solr
 Summary(fr):    API orientée objet pour Apache Solr
 Name:           %{?scl_prefix}php-pecl-solr2
-Version:        2.7.0
+Version:        2.8.0
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        PHP-3.01
 Group:          Development/Languages
@@ -46,7 +45,6 @@ BuildRequires:  %{?scl_prefix}php-curl
 BuildRequires:  %{?scl_prefix}php-json
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  pcre-devel
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
@@ -92,13 +90,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
 cd %{sources}
 : Check version
-DIR=src/php7
-extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' $DIR/php_solr_version.h)
+extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' src/php_solr_version.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
    : Error: Upstream version is ${extver}, expecting %{version}%{?prever}.
    exit 1
@@ -123,26 +120,27 @@ mkdir ZTS
 
 cd %{sources}
 %{__phpize}
+sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global
 
 cd ../NTS
 %configure \
    --with-libdir=%{_lib} \
    --with-php-config=%{__phpconfig}
-make %{?_smp_mflags}
+%make_build
 
 %if %{with_zts}
 cd ../ZTS
 %configure \
    --with-libdir=%{_lib} \
    --with-php-config=%{__ztsphpconfig}
-make %{?_smp_mflags}
+%make_build
 %endif
 
 
 %install
 %{?dtsenable}
 
-make -C NTS install INSTALL_ROOT=%{buildroot}
+%make_install -C NTS
 
 # Install XML package description
 install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
@@ -151,7 +149,7 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
 %if %{with_zts}
-make -C ZTS install INSTALL_ROOT=%{buildroot}
+%make_install -C ZTS
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
@@ -162,26 +160,6 @@ do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
 %check
 cd %{sources}
 %if %{with fulltests}
@@ -213,19 +191,11 @@ REPORT_EXIT_STATUS=1 \
 %{__ztsphp} $OPT \
    -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
    -m | grep '^%{pecl_name}$'
-
-%if %{with tests}
-: Upstream test suite for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php -q --show-diff
-%endif
 %endif
 
 
 %files
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -239,6 +209,12 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Dec 31 2024 Remi Collet <remi@remirepo.net> - 2.8.0-1
+- update to 2.8.0
+
+* Mon Nov 25 2024 Remi Collet <remi@remirepo.net> - 2.7.0-2
+- drop BR on pcre-devel
+
 * Fri Jan 12 2024 Remi Collet <remi@remirepo.net> - 2.7.0-1
 - update to 2.7.0