build out of sources treeHEADmaster

1 files changed, 34 insertions, 34 deletions

diff --git a/php-pecl-seasclick.spec b/php-pecl-seasclick.spec
index 58293bf..5c7f69a 100644
--- a/php-pecl-seasclick.spec
+++ b/php-pecl-seasclick.spec
@@ -6,32 +6,31 @@
 #
 # Please, preserve the changelog entries
 #
-%if 0%{?scl:1}
-%scl_package       php-pecl-seasclick
-%else
-%global _root_libdir %{_libdir}
-%endif
+
+%{?scl:%scl_package php-pecl-seasclick}
 
 # tests require a server
-%bcond_with        tests
+%bcond_with         tests
 
-%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global proj_name  SeasClick
-%global pecl_name  %{proj_name}
-%global lowername  seasclick
+%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
+%global proj_name   SeasClick
+%global pecl_name   %{proj_name}
+%global lowername   seasclick
 %if "%{php_version}" < "5.6"
-%global ini_name   %{pecl_name}.ini
+%global ini_name    %{pecl_name}.ini
 %else
-%global ini_name   40-%{pecl_name}.ini
+%global ini_name    40-%{pecl_name}.ini
 %endif
+%global sources     %{proj_name}-%{version}
+%global _configure  ../%{sources}/configure
 
 Summary:        An Yandex ClickHouse client driven extension for PHP
 Name:           %{?scl_prefix}php-pecl-%{lowername}
 Version:        0.1.1
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        Apache-2.0
 URL:            https://pecl.php.net/package/%{proj_name}
-Source0:        https://pecl.php.net/get/%{proj_name}-%{version}.tgz
+Source0:        https://pecl.php.net/get/%{sources}.tgz
 
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
@@ -43,7 +42,6 @@ BuildRequires:  %{?scl_prefix}php-pear
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 Requires:       %{?scl_prefix}php-json%{?_isa}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:       %{?scl_prefix}php-%{lowername}               = %{version}
 Provides:       %{?scl_prefix}php-%{lowername}%{?_isa}       = %{version}
@@ -59,15 +57,14 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c
-mv %{proj_name}-%{version} NTS
-cp NTS/lib/clickhouse-cpp/LICENSE NTS/LICENSE.clickhouse-cpp
+cp %{sources}/lib/clickhouse-cpp/LICENSE %{sources}/LICENSE.clickhouse-cpp
 
 # Don't install tests
 sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -i package.xml
 
-cd NTS
+cd %{sources}
 : Sanity check, really often broken
 extver=$(sed -n '/#define PHP_SEASCLICK_VERSION /{s/.* "//;s/".*$//;p}' php_SeasClick.h)
 if test "x${extver}" != "x%{version}"; then
@@ -76,9 +73,9 @@ if test "x${extver}" != "x%{version}"; 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
@@ -91,19 +88,20 @@ EOF
 %build
 %{?dtsenable}
 
-cd NTS
-%{_bindir}/phpize
+cd %{sources}
+%{__phpize}
+
+cd ../NTS
 %configure \
     --enable-SeasClick \
-    --with-php-config=%{_bindir}/php-config
+    --with-php-config=%{__phpconfig}
 make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
-%{_bindir}/zts-phpize
 %configure \
     --enable-SeasClick \
-    --with-php-config=%{_bindir}/zts-php-config
+    --with-php-config=%{__ztsphpconfig}
 make %{?_smp_mflags}
 %endif
 
@@ -127,34 +125,33 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 
 # Documentation
 for i in $(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
 
 
 %check
-cd NTS
+cd %{sources}
+
 : Minimal load test for NTS extension
 %{__php} --no-php-ini \
     --define extension=json.so \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-    --modules | grep -i %{pecl_name}
+    --modules | grep -i '^%{pecl_name}$'
 
 %if %{with tests}
 : Upstream test suite for NTS extension
 TEST_PHP_EXECUTABLE=%{__php} \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
+TEST_PHP_ARGS="-n -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
-%{__php} -n run-tests.php --show-diff
+%{__php} -n run-tests.php -q --show-diff
 %endif
 
 %if %{with_zts}
-cd ../ZTS
 : Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
     --define extension=json.so \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
-    --modules | grep -i %{pecl_name}
+    --modules | grep -i '^%{pecl_name}$'
 %endif
 
 
@@ -181,7 +178,7 @@ fi
 
 %files
 %doc %{pecl_docdir}/%{pecl_name}
-%{?_licensedir:%license NTS/LICENSE*}
+%{?_licensedir:%license %{sources}/LICENSE*}
 
 %{pecl_xmldir}/%{name}.xml
 %config(noreplace) %{php_inidir}/%{ini_name}
@@ -194,6 +191,9 @@ fi
 
 
 %changelog
+* Fri Sep  1 2023 Remi Collet <remi@remirepo.net> - 0.1.1-2
+- build out of sources tree
+
 * Mon Feb 27 2023 Remi Collet <remi@remirepo.net> - 0.1.1-1
 - update to 0.1.1
 - open https://github.com/SeasX/SeasClick/issues/16 PHP 5.x broken build