diff options
Diffstat (limited to 'php-pecl-solr2.spec')
| -rw-r--r-- | php-pecl-solr2.spec | 224 |
1 files changed, 122 insertions, 102 deletions
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index b8566d9..8270554 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -3,41 +3,44 @@ # # Fedora spec file for php-pecl-solr2 # -# Copyright (c) 2011-2019 Remi Collet +# Copyright (c) 2011-2024 Remi Collet # Copyright (c) 2010 Johan Cwiklinski -# License: CC-BY-SA +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%scl_package php-pecl-solr2 -%global sub_prefix %{scl_prefix} -%endif +%{?scl:%scl_package php-pecl-solr2} -%global pecl_name solr -#global prever b -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pecl_name solr +#global prever b +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} # After 20-curl, 40-json -%global ini_name 50-%{pecl_name}.ini -# 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 -# cleanup: docker stop solr5 && docker rm solr5 -%global with_tests 0%{?_with_tests:1} +%global ini_name 50-%{pecl_name}.ini +%global sources %{pecl_name}-%{version}%{?prever} +%global _configure ../%{sources}/configure + +# For full test (using localhost server) use --with fulltests +# retrieve: podman pull docker.io/omars/solr53 +# create: podman run -d -p 8983:8983 --name solr5 -t omars/solr53 +# cleanup: podman kill solr5 && podman stop solr5 && podman rm solr5 +%bcond_without tests +%bcond_with fulltests 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: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -License: PHP +Name: %{?scl_prefix}php-pecl-solr2 +Version: 2.7.0 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +License: PHP-3.01 Group: Development/Languages -URL: http://pecl.php.net/package/solr +URL: https://pecl.php.net/package/solr -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -BuildRequires: %{?scl_prefix}php-devel > 7 +BuildRequires: make +BuildRequires: %{?dtsprefix}gcc +BuildRequires: %{?scl_prefix}php-devel >= 7.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-curl BuildRequires: %{?scl_prefix}php-json @@ -49,7 +52,6 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-curl%{?_isa} Requires: %{?scl_prefix}php-json%{?_isa} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} @@ -57,46 +59,9 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name}2 = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release} -%endif -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} - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -Obsoletes: php71u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php71w-pecl-%{pecl_name}2 <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -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: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{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 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif +Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name} < 2 +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %description @@ -130,11 +95,9 @@ sed -e 's/role="test"/role="src"/' \ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml -mv %{pecl_name}-%{version}%{?prever} NTS - -cd NTS -# Check version -DIR=src/php$(%{__php} -r 'echo PHP_MAJOR_VERSION;') +cd %{sources} +: 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}. @@ -149,23 +112,29 @@ cat > %{ini_name} << 'EOF' extension=%{pecl_name}.so EOF +mkdir NTS %if %{with_zts} -cp -r NTS ZTS +mkdir ZTS %endif %build %{?dtsenable} -cd NTS -%{_bindir}/phpize -%configure --with-php-config=%{_bindir}/php-config +cd %{sources} +%{__phpize} + +cd ../NTS +%configure \ + --with-libdir=%{_lib} \ + --with-php-config=%{__phpconfig} make %{?_smp_mflags} %if %{with_zts} cd ../ZTS -%{_bindir}/zts-phpize -%configure --with-php-config=%{_bindir}/zts-php-config +%configure \ + --with-libdir=%{_lib} \ + --with-php-config=%{__ztsphpconfig} make %{?_smp_mflags} %endif @@ -189,7 +158,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} # Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -214,52 +183,49 @@ fi %check -%if %{with_tests} -sed -e '/SOLR_SERVER_CONFIGURED/s/false/true/' \ - -e '/SOLR_SERVER_HOSTNAME/s/solr.test/localhost/' \ - -i ?TS/tests/test.config.inc +cd %{sources} +%if %{with fulltests} +export SOLR_SERVER_CONFIGURED=1 %else -sed -e '/SOLR_SERVER_CONFIGURED/s/true/false/' \ - -i ?TS/tests/test.config.inc +export SOLR_SERVER_CONFIGURED=0 %endif + +OPT="-n" +[ -f %{php_extdir}/curl.so ] && OPT="$OPT -d extension=curl.so" +[ -f %{php_extdir}/json.so ] && OPT="$OPT -d extension=json.so" + : Minimal load test for NTS installed extension -%{__php} \ - -n \ - -d extension=curl.so \ - -d extension=json.so \ +%{__php} $OPT \ -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - -m | grep %{pecl_name} + -m | grep '^%{pecl_name}$' +%if %{with tests} : Upstream test suite for NTS extension -cd NTS -TEST_PHP_ARGS="-n -d extension=curl.so -d extension=json.so -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ -NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__php} \ -%{__php} -n run-tests.php --show-diff +TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ +REPORT_EXIT_STATUS=1 \ +%{__php} -n run-tests.php -q --show-diff +%endif %if %{with_zts} : Minimal load test for ZTS installed extension -%{__ztsphp} \ - -n \ - -d extension=curl.so \ - -d extension=json.so \ +%{__ztsphp} $OPT \ -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - -m | grep %{pecl_name} + -m | grep '^%{pecl_name}$' +%if %{with tests} : Upstream test suite for ZTS extension -cd ../ZTS -TEST_PHP_ARGS="-n -d extension=curl.so -d extension=json.so -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ -NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__ztsphp} \ -%{__ztsphp} -n run-tests.php --show-diff +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 NTS/LICENSE} +%{?_licensedir:%license %{sources}/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -273,6 +239,60 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Fri Jan 12 2024 Remi Collet <remi@remirepo.net> - 2.7.0-1 +- update to 2.7.0 + +* Thu Jan 11 2024 Remi Collet <remi@remirepo.net> - 2.7.0-0.3 +- another final test build for upcoming 2.7.0 + +* Thu Jan 11 2024 Remi Collet <remi@remirepo.net> - 2.7.0-0.2 +- test build for https://github.com/php/pecl-search_engine-solr/pull/69 + +* Thu Jan 11 2024 Remi Collet <remi@remirepo.net> - 2.7.0-0.1 +- final test build for upcoming 2.7.0 + +* Thu Jan 11 2024 Remi Collet <remi@remirepo.net> - 2.7.0-0 +- test build for upcoming 2.7.0 + +* Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 2.6.0-3 +- rebuild for PHP 8.3.0RC1 + +* Wed Jul 19 2023 Remi Collet <remi@remirepo.net> - 2.6.0-2 +- build out of sources tree + +* Wed Nov 9 2022 Remi Collet <remi@remirepo.net> - 2.6.0-1 +- update to 2.6.0 +- drop patch merged upstream + +* Wed Nov 9 2022 Remi Collet <remi@remirepo.net> - 2.6.0-0 +- test build for upcoming 2.6.0 +- refresh fix from PHP 8.2 from + https://github.com/php/pecl-search_engine-solr/pull/39 + +* Fri Sep 9 2022 Remi Collet <remi@remirepo.net> - 2.5.1-5 +- add fix from PHP 8.2 from + https://github.com/php/pecl-search_engine-solr/pull/39 + +* Thu Mar 17 2022 Remi Collet <remi@remirepo.net> - 2.5.1-4 +- add upstream to fix deprecation on return type +- fix compatiblity with older PHP verison from + https://github.com/php/pecl-search_engine-solr/pull/32 + +* Thu Mar 17 2022 Remi Collet <remi@remirepo.net> - 2.5.1-3 +- build for PHP 8.1 ignoring deprecation + +* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 2.5.1-2 +- rebuild for PHP 8.0.0RC1 + +* 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 + +* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 2.5.0-3 +- rebuild for 7.4.0RC1 + * Tue Jul 23 2019 Remi Collet <remi@remirepo.net> - 2.5.0-2 - rebuild for 7.4.0beta1 |