update to 3.23.2 (no change)

build out of sources tree

3 files changed, 26 insertions, 15 deletions

diff --git a/PHPINFO b/PHPINFO
index 347be7c..3621ddd 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,7 +1,7 @@
 
 protobuf
 
-Version => 3.23.1
+Version => 3.23.2
 
 Directive => Local Value => Master Value
 protobuf.keep_descriptor_pool_after_request => 0 => 0
diff --git a/REFLECTION b/REFLECTION
index e40f844..99dba59 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #122 protobuf version 3.23.1 ] {
+Extension [ <persistent> extension #122 protobuf version 3.23.2 ] {
 
   - Dependencies {
     Dependency [ date (Optional) ]
diff --git a/php-pecl-protobuf.spec b/php-pecl-protobuf.spec
index dca94a6..b944651 100644
--- a/php-pecl-protobuf.spec
+++ b/php-pecl-protobuf.spec
@@ -12,11 +12,19 @@
 
 %{?scl:%scl_package php-pecl-protobuf}
 
+# Defined in Fedora >= 37 and RHEL >= 10, in PHP >= 7.4 for remirepo
+%{!?__phpize:      %global __phpize       %{_bindir}/phpize}
+%{!?__ztsphpize:   %global __ztsphpize    %{_bindir}/zts-phpize}
+%{!?__phpconfig:   %global __phpconfig    %{_bindir}/php-config}
+%{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config}
+
 %global pecl_name   protobuf
 %global with_zts    0
 %global ini_name    40-%{pecl_name}.ini
-%global upstream_version 3.23.1
+%global upstream_version 3.23.2
 #global upstream_prever  RC2
+%global sources     %{pecl_name}-%{upstream_version}%{?upstream_prever}
+%global _configure  ../%{sources}/configure
 
 Summary:       Mechanism for serializing structured data
 Name:          %{?scl_prefix}php-pecl-%{pecl_name}
@@ -60,8 +68,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c 
-mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
-
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
     -e '/utf8_range/s/role="doc"/role="src"/' \
@@ -69,7 +75,7 @@ sed -e 's/role="test"/role="src"/' \
     %{!?_licensedir:-e '/LICENSE/s/role="src"/role="doc"/' } \
     -i package.xml
 
-cd NTS
+cd %{sources}
 cp third_party/utf8_range/LICENSE LICENSE.utf8_range
 
 # Sanity check, really often broken
@@ -80,9 +86,9 @@ if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
 fi
 cd ..
 
+mkdir NTS
 %if %{with_zts}
-# duplicate for ZTS build
-cp -pr NTS ZTS
+mkdir ZTS
 %endif
 
 # Drop in the bit of configuration
@@ -98,19 +104,20 @@ EOF
 %build
 %{?dtsenable}
 
-cd NTS
-%{_bindir}/phpize
+cd %{sources}
+%{__phpize}
+
+cd ../NTS
 %configure \
     --enable-protobuf  \
-    --with-php-config=%{_bindir}/php-config
+    --with-php-config=%{__phpconfig}
 make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
-%{_bindir}/zts-phpize
 %configure \
     --enable-protobuf  \
-    --with-php-config=%{_bindir}/zts-php-config
+    --with-php-config=%{__ztsphpconfig}
 make %{?_smp_mflags}
 %endif
 
@@ -132,7 +139,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 # Test & Documentation
-cd NTS
+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
@@ -177,7 +184,7 @@ fi
 
 
 %files
-%{?_licensedir:%license NTS/LICENSE*}
+%{?_licensedir:%license %{sources}/LICENSE*}
 %{!?_licensedir:%doc %{pecl_docdir}/%{pecl_name}}
 %{pecl_xmldir}/%{name}.xml
 
@@ -191,6 +198,10 @@ fi
 
 
 %changelog
+* Sun May 28 2023 Remi Collet <remi@remirepo.net> - 3.23.2-1
+- update to 3.23.2 (no change)
+- build out of sources tree
+
 * Fri May 19 2023 Remi Collet <remi@remirepo.net> - 3.23.1-1
 - update to 3.23.1 (no change)