summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-04-21 16:19:48 +0200
committerRemi Collet <remi@php.net>2026-04-21 16:19:48 +0200
commit0e72753a076815a2e771673df255bf54bc4e904e (patch)
tree78c27918fc152abef70cbbb051f06952d3de6ea4
parent81d4679cd0fdb052930d04421dcb41344fa0bd38 (diff)
drop pear/pecl dependency
sources from github
-rw-r--r--REFLECTION28
-rw-r--r--php-pecl-yaf.spec62
2 files changed, 40 insertions, 50 deletions
diff --git a/REFLECTION b/REFLECTION
index e85ff9a..561b619 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #126 yaf version 3.3.7 ] {
+Extension [ <persistent> extension #137 yaf version 3.3.7 ] {
- Dependencies {
Dependency [ spl (Required) ]
@@ -37,19 +37,19 @@ Extension [ <persistent> extension #126 yaf version 3.3.7 ] {
}
- Constants [13] {
- Constant [ string YAF_VERSION ] { 3.3.7 }
- Constant [ string YAF_ENVIRON ] { product }
- Constant [ int YAF_ERR_STARTUP_FAILED ] { 512 }
- Constant [ int YAF_ERR_ROUTE_FAILED ] { 513 }
- Constant [ int YAF_ERR_DISPATCH_FAILED ] { 514 }
- Constant [ int YAF_ERR_AUTOLOAD_FAILED ] { 520 }
- Constant [ int YAF_ERR_NOTFOUND_MODULE ] { 515 }
- Constant [ int YAF_ERR_NOTFOUND_CONTROLLER ] { 516 }
- Constant [ int YAF_ERR_NOTFOUND_ACTION ] { 517 }
- Constant [ int YAF_ERR_NOTFOUND_VIEW ] { 518 }
- Constant [ int YAF_ERR_CALL_FAILED ] { 519 }
- Constant [ int YAF_ERR_TYPE_ERROR ] { 521 }
- Constant [ int YAF_ERR_ACCESS_ERROR ] { 522 }
+ Constant [ <persistent> string YAF_VERSION ] { 3.3.7 }
+ Constant [ <persistent> string YAF_ENVIRON ] { product }
+ Constant [ <persistent> int YAF_ERR_STARTUP_FAILED ] { 512 }
+ Constant [ <persistent> int YAF_ERR_ROUTE_FAILED ] { 513 }
+ Constant [ <persistent> int YAF_ERR_DISPATCH_FAILED ] { 514 }
+ Constant [ <persistent> int YAF_ERR_AUTOLOAD_FAILED ] { 520 }
+ Constant [ <persistent> int YAF_ERR_NOTFOUND_MODULE ] { 515 }
+ Constant [ <persistent> int YAF_ERR_NOTFOUND_CONTROLLER ] { 516 }
+ Constant [ <persistent> int YAF_ERR_NOTFOUND_ACTION ] { 517 }
+ Constant [ <persistent> int YAF_ERR_NOTFOUND_VIEW ] { 518 }
+ Constant [ <persistent> int YAF_ERR_CALL_FAILED ] { 519 }
+ Constant [ <persistent> int YAF_ERR_TYPE_ERROR ] { 521 }
+ Constant [ <persistent> int YAF_ERR_ACCESS_ERROR ] { 522 }
}
- Classes [38] {
diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec
index 1511647..7163aa0 100644
--- a/php-pecl-yaf.spec
+++ b/php-pecl-yaf.spec
@@ -11,23 +11,25 @@
%bcond_without tests
-%global gh_commit 51e458e9746d7061efc565d49baaca26feacd7ff
-%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner laruence
-%global gh_project yaf
-%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name yaf
+%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global ini_name 40-%{pecl_name}.ini
-%global sources %{pecl_name}-%{version}
-%global _configure ../%{sources}/configure
+%global _configure ../configure
+
+# Github forge
+%global gh_vend laruence
+%global gh_proj %{pecl_name}
+%global forgeurl https://github.com/%{gh_vend}/%{gh_proj}
+%global tag %{version}
-Summary: Yet Another Framework
Name: %{?scl_prefix}php-pecl-yaf
-Version: 3.3.7
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Summary: Yet Another Framework
License: PHP-3.01
-URL: https://pecl.php.net/package/yaf
-Source0: https://pecl.php.net/get/%{sources}%{?prever}.tgz
+Version: 3.3.7
+Release: 2%{?dist}
+%forgemeta
+URL: %{forgeurl}
+Source0: %{forgesource}
Source1: %{pecl_name}.ini
BuildRequires: make
@@ -40,10 +42,13 @@ BuildRequires: %{?scl_prefix}php-json
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
+# Extension
Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+# PECL
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+# No PIE for now
%description
@@ -54,21 +59,14 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
-%setup -qc
+%forgesetup
-# Don't install/register tests
-sed -e 's/role="test"/role="src"/' \
- -e '/LICENSE/s/role="doc"/role="src"/' \
- -i package.xml
-
-cd %{sources}
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_YAF_VERSION/{s/.*\t"//;s/".*$//;p}' php_yaf.h )
if test "x${extver}" != "x%{version}"; then
: Error: Upstream extension version is ${extver}, expecting %{version}.
exit 1
fi
-cd ..
mkdir NTS
%if %{with_zts}
@@ -81,12 +79,11 @@ mkdir ZTS
export CFLAGS="%{optflags} -Wno-duplicate-decl-specifier"
-cd %{sources}
%{__phpize}
[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
-cd ../NTS
+cd NTS
%configure --with-php-config=%{__phpconfig}
%make_build
@@ -110,19 +107,8 @@ install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name}
install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
-# Install the package XML file
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-# Documentation
-cd %{sources}
-for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
%check
-cd %{sources}
-
OPTS="-n"
[ -f %{php_extdir}/json.so ] && OPTS="$OPTS -d extension=json.so"
@@ -148,9 +134,9 @@ REPORT_EXIT_STATUS=1 \
%files
-%license %{sources}/LICENSE
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
+%license LICENSE
+%doc CREDITS
+%doc *.md
%config(noreplace) %{php_inidir}/%{ini_name}
%{php_extdir}/%{pecl_name}.so
@@ -162,6 +148,10 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Tue Apr 21 2026 Remi Collet <remi@remirepo.net> - 3.3.7-2
+- drop pear/pecl dependency
+- sources from github
+
* Tue Jul 29 2025 Remi Collet <remi@remirepo.net> - 3.3.7-1
- update to 3.3.7
- drop patches merged upstream