build out of sources treeHEADmaster

1 files changed, 40 insertions, 31 deletions

diff --git a/php-pecl-ps.spec b/php-pecl-ps.spec
index 440435a..756c320 100644
--- a/php-pecl-ps.spec
+++ b/php-pecl-ps.spec
@@ -1,27 +1,31 @@
 # remirepo spec file for php-pecl-ps
 #
-# Copyright (c) 2021 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2021-2023 Remi Collet
+# License: CC-BY-SA-1.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%{?scl:          %scl_package        php-pecl-ps}
+%{?scl:%scl_package php-pecl-ps}
 
-%global with_zts  0%{!?_without_zts:%{?__ztsphp:1}}
-%global pecl_name ps
+%bcond_without      tests
+
+%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
+%global pecl_name   ps
 # After 20-gd.ini
-%global ini_name  40-%{pecl_name}.ini
+%global ini_name    40-%{pecl_name}.ini
+%global sources     %{pecl_name}-%{version}
+%global _configure  ../%{sources}/configure
 
 Summary:        An extension to create PostScript files
 Name:           %{?scl_prefix}php-pecl-ps
 Version:        1.4.4
-Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
-License:        PHP
+Release:        2%{?dist}%{!?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
@@ -34,7 +38,6 @@ BuildRequires:  pkgconfig(libps)
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 Requires:       %{?scl_prefix}php-gd%{?_isa}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
@@ -66,14 +69,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %prep
 %setup -c -q
 
-mv %{pecl_name}-%{version} NTS
-
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -i package.xml
 
-pushd NTS
+pushd %{sources}
 # Check version
 extver=$(sed -n '/#define PHP_PS_VERSION/{s/.* "//;s/".*$//;p}' php_ps.h)
 if test "x${extver}" != "x%{version}"; then
@@ -82,8 +83,9 @@ if test "x${extver}" != "x%{version}"; then
 fi
 popd
 
+mkdir NTS
 %if %{with_zts}
-cp -pr NTS ZTS
+mkdir ZTS
 %endif
 
 # Create the config file
@@ -96,12 +98,14 @@ EOF
 %build
 %{?dtsenable}
 
-cd NTS
-%{_bindir}/phpize
+cd %{sources}
+%{__phpize}
+
+cd ../NTS
 %configure \
   --with-ps \
   --enable-gd \
-  --with-php-config=%{_bindir}/php-config
+  --with-php-config=%{__phpconfig}
 make %{?_smp_mflags}
 
 %{__php} --no-php-ini \
@@ -112,15 +116,14 @@ make %{?_smp_mflags}
 %{__php} --no-php-ini \
     --define extension=gd.so \
     --define extension=modules/%{pecl_name}.so \
-    --re %{pecl_name} >REFLECTION
+    --re %{pecl_name} >../%{sources}/REFLECTION
 
 %if %{with_zts}
 cd ../ZTS
-%{_bindir}/zts-phpize
 %configure \
   --with-ps \
   --enable-gd \
-  --with-php-config=%{_bindir}/zts-php-config
+  --with-php-config=%{__ztsphpconfig}
 make %{?_smp_mflags}
 %endif
 
@@ -142,40 +145,43 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Documentation
-cd NTS
+cd %{sources}
 for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') REFLECTION
 do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
 %check
+cd %{sources}
 OPT="-n"
 OPT="$OPT -d extension=gd.so"
 
 : Minimal load test for NTS extension
-cd NTS
-%{_bindir}/php $OPT \
-    --define extension=modules/%{pecl_name}.so \
+%{__php} $OPT \
+    --define extension=../NTS/modules/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
+%if %{with tests}
 : Upstream test suite for NTS extension
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
-TEST_PHP_ARGS="$OPT -d extension=$PWD/modules/%{pecl_name}.so" \
-%{_bindir}/php -n run-tests.php -q --show-diff
+TEST_PHP_EXECUTABLE=%{__php} \
+TEST_PHP_ARGS="$OPT -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \
+%{__php} -n run-tests.php -q --show-diff
+%endif
 
 
 %if %{with_zts}
 : Minimal load test for ZTS extension
-cd ../ZTS
 %{__ztsphp} $OPT \
-    --define extension=modules/%{pecl_name}.so \
+    --define extension=../ZTS/modules/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
+%if %{with tests}
 : Upstream test suite for ZTS extension
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="$OPT -d extension=$PWD/modules/%{pecl_name}.so" \
+TEST_PHP_ARGS="$OPT -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \
 %{__ztsphp} -n run-tests.php -q --show-diff
 %endif
+%endif
 
 
 %if 0%{?fedora} < 24 && 0%{?rhel} < 8
@@ -199,7 +205,7 @@ fi
 
 
 %files
-%{?_licensedir:%license NTS/LICENSE}
+%{?_licensedir:%license %{sources}/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -213,6 +219,9 @@ fi
 
 
 %changelog
+* Fri Sep  1 2023 Remi Collet <remi@remirepo.net> - 1.4.4-2
+- build out of sources tree
+
 * Thu Sep 30 2021 Remi Collet <remi@remirepo.net> - 1.4.4-1
 - update to 1.4.4
 - drop patches merged upstream