From 5b60f02b86c6ee70c893d907c433d4d892ba7787 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Jul 2021 07:14:00 +0200 Subject: update to 5.0.0-alpha.2 rename to php-phalcon5 raise dependency on PHP 7.4 raise dependency on psr 1.0.1 --- php-phalcon5.spec | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) (limited to 'php-phalcon5.spec') diff --git a/php-phalcon5.spec b/php-phalcon5.spec index 4ae9d5f..95123a0 100644 --- a/php-phalcon5.spec +++ b/php-phalcon5.spec @@ -1,6 +1,6 @@ -# remirepo spec file for php-phalcon4 +# remirepo spec file for php-phalcon5 # -# Copyright (c) 2014-2020 Remi Collet +# Copyright (c) 2014-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,21 +11,22 @@ %undefine _strict_symbol_defs_build %if 0%{?scl:1} -%global sub_prefix %{scl_prefix} %scl_package php-phalcon4 %else %global pkg_name %{name} %endif +%bcond_with tests + %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global with_tests 0%{?_with_tests:1} %global pecl_name phalcon # after 40-json.ini, 20-pdo.ini, 40-psr.ini %global ini_name 50-%{pecl_name}.ini -%global upstream_ver 4.1.2 -#global upstream_pre rc.3 +%global upstream_ver 5.0.0 +%global upstream_pre alpha2 +%global upstream_dis alpha.2 -Name: %{?sub_prefix}php-phalcon4 +Name: %{?scl_prefix}php-phalcon5 Version: %{upstream_ver}%{?upstream_pre:~%{upstream_pre}} Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: Phalcon Framework @@ -36,40 +37,35 @@ URL: https://pecl.php.net/package/phalcon # git checkout v#.#.# # ln -s build/php7/safe/* . # pecl package -Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_ver}%{?upstream_pre}.tgz BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel < 8 -BuildRequires: %{?scl_prefix}php-devel >= 7.2 +BuildRequires: %{?scl_prefix}php-devel >= 7.4.1 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-hash BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-pdo -BuildRequires: %{?scl_prefix}php-psr +BuildRequires: %{?scl_prefix}php-pecl-psr-devel >= 1.0.1 Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-hash%{?_isa} Requires: %{?scl_prefix}php-json%{?_isa} Requires: %{?scl_prefix}php-pdo%{?_isa} -Requires: %{?scl_prefix}php-psr%{?_isa} +Requires: %{?scl_prefix}php-psr%{?_isa} >= 1.0.1 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-phalcon = %{version}-%{release} Provides: %{?scl_prefix}php-phalcon%{?_isa} = %{version}-%{release} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-phalcon4 = %{version}-%{release} -Provides: %{?scl_prefix}php-phalcon4%{?_isa} = %{version}-%{release} -%endif -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 || "%{php_version}" > "7.4" + Obsoletes: %{?scl_prefix}php-phalcon < 4 Obsoletes: %{?scl_prefix}php-phalcon2 < 4 Obsoletes: %{?scl_prefix}php-phalcon3 < 4 +%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9 || "%{php_version}" > "8.0" +Obsoletes: %{?scl_prefix}php-phalcon4 < 5 %else # Only one version can be installed -Conflicts: %{?scl_prefix}php-phalcon < 4 -Conflicts: %{?scl_prefix}php-phalcon2 < 4 -Conflicts: %{?scl_prefix}php-phalcon3 < 4 +Conflicts: %{?scl_prefix}php-phalcon4 < 5 %endif # PECL Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} @@ -98,12 +94,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -qc -mv %{pecl_name}-%{version}%{?upstream_pre} NTS +mv %{pecl_name}-%{upstream_ver}%{?upstream_pre} NTS cd NTS # Sanity check, really often broken extver=$(sed -n '/#define PHP_PHALCON_VERSION/{s/.* "//;s/".*$//;p}' php_phalcon.h) -if test "x${extver}" != "x%{upstream_ver}%{?upstream_pre:-%{upstream_pre}}"; then +if test "x${extver}" != "x%{upstream_ver}%{?upstream_pre:-%{upstream_dis}}"; then : Error: Upstream extension version is ${extver}, expecting %{upstream_ver}%{?upstream_pre:-%{upstream_pre}}. exit 1 fi @@ -201,9 +197,9 @@ done %{__php} --no-php-ini \ $modules \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep -i %{pecl_name} + --modules | grep -i '^%{pecl_name}$' -%if %{with_tests} +%if %{with tests} : Upstream test suite NTS extension cd build/NTS SKIP_ONLINE_TESTS=1 \ @@ -219,7 +215,7 @@ REPORT_EXIT_STATUS=1 \ %{__ztsphp} --no-php-ini \ $modules \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep -i %{pecl_name} + --modules | grep -i '^%{pecl_name}$' %endif @@ -260,6 +256,12 @@ fi %changelog +* Thu May 6 2021 Remi Collet - 5.0.0~alpha2-1 +- update to 5.0.0-alpha.2 +- rename to php-phalcon5 +- raise dependency on PHP 7.4 +- raise dependency on psr 1.0.1 + * Mon Apr 26 2021 Remi Collet - 4.1.2-1 - update to 4.1.2 -- cgit