diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-protobuf.spec | 65 |
3 files changed, 34 insertions, 35 deletions
@@ -1,7 +1,7 @@ protobuf -Version => 5.34.0 +Version => 5.34.1 Directive => Local Value => Master Value protobuf.keep_descriptor_pool_after_request => 0 => 0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #108 protobuf version 5.34.0 ] { +Extension [ <persistent> extension #110 protobuf version 5.34.1 ] { - Dependencies { Dependency [ date (Optional) ] diff --git a/php-pecl-protobuf.spec b/php-pecl-protobuf.spec index 95b8a34..0d41eaa 100644 --- a/php-pecl-protobuf.spec +++ b/php-pecl-protobuf.spec @@ -12,25 +12,34 @@ %global pecl_name protobuf %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini -%global upstream_version 5.34.0 +%global library_version 34.1 +%global upstream_version 5.%{library_version} #global upstream_prever RC1 -%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} +%global sources php/ext/google/protobuf %global _configure ../%{sources}/configure -Summary: Mechanism for serializing structured data +# Github forge +%global gh_vend protocolbuffers +%global gh_proj protobuf +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +%global tag v%{library_version}%{?upstream_prever} +# for EL-8 to avoid TAG usage +%global archivename %{gh_proj}-%{library_version}%{?upstream_prever} + Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Summary: Mechanism for serializing structured data # protobuf extension is BSD # third_party/utf8_range is MIT License: BSD-3-Clause and MIT -URL: https://pecl.php.net/package/%{pecl_name} -Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Release: 1%{?dist} +%forgemeta +URL: %{forgeurl} +Source0: %{forgesource} BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 8.2 -BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -41,6 +50,7 @@ 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 @@ -53,23 +63,19 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep -%setup -q -c -# Don't install/register tests -sed -e 's/role="test"/role="src"/' \ - -e '/utf8_range/s/role="doc"/role="src"/' \ - -e '/LICENSE/s/role="doc"/role="src"/' \ - -i package.xml - -cd %{sources} +%forgesetup cp third_party/utf8_range/LICENSE LICENSE.utf8_range +pushd %{sources} +ln -s ../../../../third_party + # Sanity check, really often broken extver=$(sed -n '/#define PHP_PROTOBUF_VERSION/{s/.* "//;s/".*$//;p}' protobuf.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. exit 1 fi -cd .. +popd mkdir NTS %if %{with_zts} @@ -89,11 +95,12 @@ EOF %build %{?dtsenable} -cd %{sources} +pushd %{sources} %{__phpize} sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global +popd -cd ../NTS +cd NTS %configure \ --enable-protobuf \ --with-php-config=%{__phpconfig} @@ -123,18 +130,6 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif -# Install the package XML file -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - -# Test & Documentation -cd %{sources} -for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i -done -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 : Minimal load test for NTS extension @@ -152,8 +147,7 @@ done %files -%license %{sources}/LICENSE* -%{pecl_xmldir}/%{name}.xml +%license LICENSE* %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -165,6 +159,11 @@ done %changelog +* Fri Mar 20 2026 Remi Collet <remi@remirepo.net> - 5.34.1-1 +- update to 5.34.1 (no change) +- drop pear/pecl dependency +- sources from github + * Fri Feb 27 2026 Remi Collet <remi@remirepo.net> - 5.34.0-1 - update to 5.34.0 |