diff options
author | Remi Collet <remi@remirepo.net> | 2023-02-28 12:12:18 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2023-02-28 12:12:18 +0100 |
commit | a2b209b2c72fd10fc14541243e8e7160b2f724e2 (patch) | |
tree | 0607e73c58ecbbbb6ff9dc0ce7c3ba05832e3e53 /php-phalcon5.spec | |
parent | ce817763043c48f0a376a53e79bcd319ddccee46 (diff) |
update to 5.2.0
fix License
add patch for https://github.com/phalcon/cphalcon/issues/16295
build failure on EL7 with 8.2, from
https://github.com/phalcon/cphalcon/pull/16296
Diffstat (limited to 'php-phalcon5.spec')
-rw-r--r-- | php-phalcon5.spec | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/php-phalcon5.spec b/php-phalcon5.spec index 1215bdc..b58154b 100644 --- a/php-phalcon5.spec +++ b/php-phalcon5.spec @@ -1,7 +1,7 @@ # remirepo spec file for php-phalcon5 # # Copyright (c) 2014-2023 Remi Collet -# License: CC-BY-SA +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -22,7 +22,7 @@ %global pecl_name phalcon # after 40-json.ini, 20-pdo.ini %global ini_name 50-%{pecl_name}.ini -%global upstream_ver 5.1.4 +%global upstream_ver 5.2.0 #global upstream_pre RC4 #global upstream_low %%(echo %%{upstream_pre} | tr '[:upper:]' '[:lower:]') @@ -31,7 +31,7 @@ Version: %{upstream_ver}%{?upstream_pre:~%{upstream_low}} Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: Phalcon Framework -License: MIT +License: BSD 3-Clause URL: https://pecl.php.net/package/phalcon # when missing on pecl, generated from git # git checkout v#.#.# @@ -39,9 +39,12 @@ 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/16296 +Patch0: %{pecl_name}-php82.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.4.1 -BuildRequires: %{?scl_prefix}php-devel < 8.2 +BuildRequires: %{?scl_prefix}php-devel < 8.3 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-hash BuildRequires: %{?scl_prefix}php-json @@ -87,9 +90,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -qc +%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} + mv %{pecl_name}-%{upstream_ver}%{?upstream_pre} NTS cd NTS +%patch0 -p3 + # 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 @@ -250,6 +257,13 @@ fi %changelog +* Tue Feb 28 2023 Remi Collet <remi@remirepo.net> - 5.2.0-1 +- update to 5.2.0 +- fix License +- add patch for https://github.com/phalcon/cphalcon/issues/16295 + build failure on EL7 with 8.2, from + https://github.com/phalcon/cphalcon/pull/16296 + * Wed Jan 11 2023 Remi Collet <remi@remirepo.net> - 5.1.4-1 - update to 5.1.4 |