summaryrefslogtreecommitdiffstats
path: root/php-phalcon5.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-phalcon5.spec')
-rw-r--r--php-phalcon5.spec17
1 files changed, 14 insertions, 3 deletions
diff --git a/php-phalcon5.spec b/php-phalcon5.spec
index d0653dc..510a0d5 100644
--- a/php-phalcon5.spec
+++ b/php-phalcon5.spec
@@ -23,7 +23,7 @@
# after 40-json.ini, 20-pdo.ini, 40-psr.ini
%global ini_name 50-%{pecl_name}.ini
%global upstream_ver 5.0.0
-%global upstream_pre alpha3
+%global upstream_pre alpha4
Name: %{?scl_prefix}php-phalcon5
Version: %{upstream_ver}%{?upstream_pre:~%{upstream_pre}}
@@ -38,20 +38,23 @@ URL: https://pecl.php.net/package/phalcon
# pecl package
Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_ver}%{?upstream_pre}.tgz
+# See https://github.com/phalcon/cphalcon/pull/15646
+Patch0: build.patch
+
BuildRequires: %{?dtsprefix}gcc
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-pecl-psr-devel >= 1.0.1
+BuildRequires: %{?scl_prefix}php-pecl-psr-devel >= 1.1.0
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} >= 1.0.1
+Requires: %{?scl_prefix}php-psr%{?_isa} >= 1.1.0
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
Provides: %{?scl_prefix}php-phalcon = %{version}-%{release}
@@ -96,6 +99,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
mv %{pecl_name}-%{upstream_ver}%{?upstream_pre} NTS
cd NTS
+%patch0 -p1
+
# 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
@@ -255,6 +260,12 @@ fi
%changelog
+* Tue Sep 7 2021 Remi Collet <remi@remirepo.net> - 5.0.0~alpha4-1
+- update to 5.0.0alpha4
+- raise dependency on psr 1.1.0
+- add fix for https://github.com/phalcon/cphalcon/issues/15645
+ from https://github.com/phalcon/cphalcon/pull/15646
+
* Thu Jul 1 2021 Remi Collet <remi@remirepo.net> - 5.0.0~alpha3-1
- update to 5.0.0alpha3