build out of sources treeHEADmaster

2 files changed, 39 insertions, 55 deletions

diff --git a/REFLECTION b/REFLECTION
index 3b92570..92b20ca 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -16,16 +16,18 @@ Extension [ <persistent> extension #125 uploadprogress version 2.0.2 ] {
     Function [ <internal:uploadprogress> function uploadprogress_get_info ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $identifier ]
+        Parameter #0 [ <required> string $identifier ]
       }
+      - Return [ ?array ]
     }
     Function [ <internal:uploadprogress> function uploadprogress_get_contents ] {
 
       - Parameters [3] {
-        Parameter #0 [ <required> $identifier ]
-        Parameter #1 [ <required> $fieldname ]
-        Parameter #2 [ <optional> $maxlen ]
+        Parameter #0 [ <required> string $identifier ]
+        Parameter #1 [ <required> string $fieldname ]
+        Parameter #2 [ <optional> int $maxlen = -1 ]
       }
+      - Return [ ?string ]
     }
   }
 }
diff --git a/php-pecl-uploadprogress.spec b/php-pecl-uploadprogress.spec
index 0b9ff7b..5a20f2a 100644
--- a/php-pecl-uploadprogress.spec
+++ b/php-pecl-uploadprogress.spec
@@ -1,30 +1,30 @@
 # remirepo spec file for php-pecl-uploadprogress
 #
-# Copyright (c) 2013-2021 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2013-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
-%scl_package      php-pecl-uploadprogress
-%endif
 
-%bcond_without    tests
+%{?scl:%scl_package php-pecl-uploadprogress}
+
+%bcond_without      tests
 
-%global with_zts  0%{!?_without_zts:%{?__ztsphp:1}}
-%global pecl_name uploadprogress
-%global ini_name  40-%{pecl_name}.ini
+%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
+%global pecl_name   uploadprogress
+%global ini_name    40-%{pecl_name}.ini
+%global sources     %{pecl_name}-%{version}
+%global _configure  ../%{sources}/configure
 
 Summary:        An extension to track progress of a file upload
-Name:           %{?sub_prefix}php-pecl-%{pecl_name}
+Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        2.0.2
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License:        PHP
+Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+License:        PHP-3.01
 Group:          Development/Languages
 URL:            https://pecl.php.net/package/%{pecl_name}
-Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Source0:        https://pecl.php.net/get/%{sources}.tgz
 
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
@@ -33,7 +33,6 @@ BuildRequires:  %{?scl_prefix}php-pear
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
@@ -42,24 +41,6 @@ Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "7.3"
-Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.0"
-Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.1"
-Obsoletes:      php81-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
-
 
 %description
 A PHP extension to track progress of a file upload, including details
@@ -71,11 +52,10 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c
-mv %{pecl_name}-%{version} NTS
 
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
-cd NTS
+cd %{sources}
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_UPLOADPROGRESS_VERSION/{s/.* "//;s/".*$//;p}' php_uploadprogress.h)
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -84,9 +64,9 @@ if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
 fi
 cd ..
 
+mkdir NTS
 %if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
+mkdir ZTS
 %endif
 
 # Create configuration file
@@ -104,20 +84,21 @@ EOF
 %build
 %{?dtsenable}
 
-cd NTS
-%{_bindir}/phpize
+cd %{sources}
+%{__phpize}
+
+cd ../NTS
 %configure \
     --with-libdir=%{_lib} \
-    --with-php-config=%{_bindir}/php-config
+    --with-php-config=%{__phpconfig}
 
 make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
-%{_bindir}/zts-phpize
 %configure \
     --with-libdir=%{_lib} \
-    --with-php-config=%{_bindir}/zts-php-config
+    --with-php-config=%{__ztsphpconfig}
 
 make %{?_smp_mflags}
 %endif
@@ -141,7 +122,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 
 # Documentation
 for i in %{!?_licensedir:LICENSE} $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
+do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
@@ -167,21 +148,19 @@ fi
 
 %check
 : Minimal load test for NTS extension
-cd NTS
 %{__php} --no-php-ini \
-    --define extension=modules/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
+    --define extension=NTS/modules/%{pecl_name}.so \
+    --modules | grep '^%{pecl_name}$'
 
 %if %{with_zts}
 : Minimal load test for ZTS extension
-cd ../ZTS
 %{__ztsphp} --no-php-ini \
-    --define extension=modules/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
+    --define extension=ZTS/modules/%{pecl_name}.so \
+    --modules | grep '^%{pecl_name}$'
 %endif
 
 %if %{with tests}
-cd ../NTS
+cd %{sources}
 : Run upstream test suite
 TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 %{__php} -n run-tests.php -q -P --show-diff
@@ -189,7 +168,7 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 
 
 %files
-%{?_licensedir:%license NTS/LICENSE}
+%{?_licensedir:%license %{sources}/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -203,6 +182,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 
 
 %changelog
+* Mon Sep  4 2023 Remi Collet <remi@remirepo.net> - 2.0.2-2
+- build out of sources tree
+
 * Fri Oct  1 2021 Remi Collet <remi@remirepo.net> - 2.0.2-1
 - update to 2.0.2 (documentation changes only)