diff options
| -rw-r--r-- | php-pecl-recode.spec | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/php-pecl-recode.spec b/php-pecl-recode.spec index 5f3e561..5d196fc 100644 --- a/php-pecl-recode.spec +++ b/php-pecl-recode.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-recode # -# Copyright (c) 2019-2020 Remi Collet +# Copyright (c) 2019-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,13 +11,14 @@ %undefine _strict_symbol_defs_build %if 0%{?scl:1} -%global sub_prefix %{scl_prefix} %scl_package php-pecl-recode %else %global _root_bindir %{_bindir} %global _root_libexecdir %{_libexecdir} %endif +%bcond_without tests + # https://github.com/php/pecl-text-recode/commits/master %global gh_commit 3e049a6b3a5138c6bad444cd29393b3150958c64 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -26,23 +27,23 @@ %global gh_date 20190723 %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name recode -%global with_tests 0%{!?_without_tests:1} %global upver 1.0.0 %global lower DEV # After 20-xml %global ini_name 30-%{pecl_name}.ini Summary: A module for PHP applications for using the recode library -Name: %{?sub_prefix}php-pecl-%{pecl_name} +Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/%{pecl_name} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{upver}-%{gh_short}.tar.gz +BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel > 7.4 +BuildRequires: %{?scl_prefix}php-devel >= 7.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: recode-devel @@ -56,24 +57,6 @@ Provides: %{?scl_prefix}php-%{pecl_name} = 1:%{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = 1:%{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared object -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif %description @@ -171,9 +154,14 @@ cd ../ZTS %endif -%if %{with_tests} +%if %{with tests} cd ../NTS +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 +: ignore test failing with recode 3.7 +rm tests/001.phpt +%endif + : Run upstream test suite TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ @@ -198,6 +186,12 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Sep 13 2022 Remi Collet <remi@remirepo.net> - 1.0.0~DEV.20190723-6 +- EL-9 build + +* Wed Feb 19 2020 Remi Collet <remi@remirepo.net> - 1.0.0~DEV.20190723-5 +- ignore 1 test failing with recode 3.7 + * Mon Feb 03 2020 Remi Collet <remi@remirepo.net> - 1.0.0~DEV.20190723-4 - fix obsolete |