diff options
| author | Remi Collet <remi@remirepo.net> | 2026-04-04 08:48:54 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-04-04 08:48:54 +0200 |
| commit | 224403f8d384d752d70667184ec96622e00a34cd (patch) | |
| tree | c333fab4ae4d1597ac907018fa1e06d55eb7e554 /php-phalcon5.spec | |
| parent | 30b5adceee6fd3542ace61d51271ccd8ec481426 (diff) | |
update to 5.11.0
drop pear/pecl dependency
sources from github
add pie virtual provides
add support for 8.5, drop 8.0
open https://github.com/phalcon/cphalcon/issues/16874
ext tree is unusable for PHP 8.5
Diffstat (limited to 'php-phalcon5.spec')
| -rw-r--r-- | php-phalcon5.spec | 82 |
1 files changed, 53 insertions, 29 deletions
diff --git a/php-phalcon5.spec b/php-phalcon5.spec index 70850af..feaacbc 100644 --- a/php-phalcon5.spec +++ b/php-phalcon5.spec @@ -7,33 +7,53 @@ # Please, preserve the changelog entries # -%{?scl:%scl_package php-phalcon5} +%{?scl:%scl_package php-phalcon5} + +# option to build the singled source file OR the full source tree +# single is upstream preferred, slower to build but smaller binary +# See https://github.com/phalcon/cphalcon/issues/16874 ext tree is unusable PHP 8.5 +%ifarch aarch64 +%bcond_with single +%else +%bcond_without single +%endif %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name phalcon # after 40-json.ini, 20-pdo.ini %global ini_name 50-%{pecl_name}.ini -%global upstream_version 5.10.0 +%global pie_vend %{pecl_name} +%global pie_proj cphalcon + +%global upstream_version 5.11.0 #global upstream_prever RC4 #global upstream_low %%(echo %%{upstream_prever} | tr '[:upper:]' '[:lower:]') -%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} +%if %{with single} +%global sources %{archivename}/build/phalcon +%else +%global sources %{archivename}/ext +%endif %global _configure ../%{sources}/configure +# Github forge +%global gh_vend %{pecl_name} +%global gh_proj %{pie_proj} +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +%global tag v%{upstream_version}%{?upstream_prever} +# for EL-8 to avoid TAG usage +%global archivename %{gh_proj}-%{upstream_version}%{?upstream_prever} + Name: %{?scl_prefix}php-phalcon5 -Version: %{upstream_version}%{?upstream_prever:~%{upstream_low}} -Release: 1%{?dist} Summary: Phalcon Framework - License: BSD-3-Clause +Version: %{upstream_version}%{?upstream_prever:~%{upstream_low}} +Release: 1%{?dist} +%forgemeta URL: https://phalcon.io/ -# when missing on pecl, generated from git -# git checkout v#.#.# -# ln -s build/phalcon/* . -# pecl package -Source0: https://pecl.php.net/get/%{sources}.tgz +Source0: %{forgesource} BuildRequires: %{?dtsprefix}gcc -BuildRequires:(%{?scl_prefix}php-devel >= 8.0 with %{?scl_prefix}php-devel < 8.5) +BuildRequires: %{?scl_prefix}php-devel >= 8.1 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-hash BuildRequires: %{?scl_prefix}php-json @@ -45,6 +65,7 @@ Requires: %{?scl_prefix}php-hash%{?_isa} Requires: %{?scl_prefix}php-json%{?_isa} Requires: %{?scl_prefix}php-pdo%{?_isa} +# Extension Provides: %{?scl_prefix}php-phalcon = %{version}-%{release} Provides: %{?scl_prefix}php-phalcon%{?_isa} = %{version}-%{release} @@ -62,6 +83,9 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{rele Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} %description @@ -76,16 +100,14 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -qc -sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml - -cd %{sources} +pushd %{sources} # Sanity check, really often broken extver=$(sed -n '/#define PHP_PHALCON_VERSION/{s/.* "//;s/".*$//;p}' php_phalcon.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever:%{upstream_prever}}"; then : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever:%{upstream_prever}}. exit 1 fi -cd .. +popd mkdir NTS %if %{with_zts} @@ -135,12 +157,13 @@ peclconf() { # See https://github.com/phalcon/cphalcon/issues/16531 export CFLAGS="%{optflags} -Wno-incompatible-pointer-types" -cd %{sources} +pushd %{sources} %{__phpize} sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global +popd : Build NTS extension -cd ../NTS +cd NTS peclconf %{__phpconfig} %make_build @@ -155,9 +178,6 @@ peclconf %{__ztsphpconfig} %install %{?dtsenable} -# Install XML package description -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - # Install the NTS stuff %make_install -C NTS install -Dpm644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -168,11 +188,6 @@ install -Dpm644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -Dpm644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif -# Documentation -for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - %check # Shared needed extensions @@ -199,9 +214,9 @@ done %files -%license %{sources}/LICENSE.txt -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml +%license %{archivename}/LICENSE.txt +%doc %{archivename}/composer.json +%doc %{archivename}/*.md %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -215,6 +230,15 @@ done %changelog +* Sat Apr 4 2026 Remi Collet <remi@remirepo.net> - 5.11.0-1 +- update to 5.11.0 +- drop pear/pecl dependency +- sources from github +- add pie virtual provides +- add support for 8.5, drop 8.0 +- open https://github.com/phalcon/cphalcon/issues/16874 + ext tree is unusable for PHP 8.5 + * Sat Jan 3 2026 Remi Collet <remi@remirepo.net> - 5.10.0-1 - update to 5.10.0 |
