From 7afc6f39e746eb7ac95e584beebc0ad13844a005 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Sep 2018 15:20:59 +0200 Subject: add patch for PHP 7.3 on 32-bit from https://github.com/nbs-system/snuffleupagus/pull/242 --- php-snuffleupagus.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'php-snuffleupagus.spec') diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec index bc44d07..724c9d5 100644 --- a/php-snuffleupagus.spec +++ b/php-snuffleupagus.spec @@ -35,19 +35,23 @@ Version: 0.4.0 %if 0%{?gh_date} Release: 1%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -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;')}} %endif License: LGPLv3 Group: Development/Languages URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pkg_name}-%{version}-%{gh_short}.tar.gz +Patch0: https://patch-diff.githubusercontent.com/raw/nbs-system/snuffleupagus/pull/242.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: pcre-devel # For tests/upload_validation_real.phpt BuildRequires: %{_root_bindir}/python BuildRequires: %{?scl_prefix}php-vld +#BuildRequires: gdb +#BuildRequires: php-debuginfo Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -90,6 +94,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 -b .pr242 cd src # Sanity check, really often broken @@ -175,7 +180,7 @@ cd src : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{__php} -n run-tests.php --show-diff @@ -184,7 +189,7 @@ REPORT_EXIT_STATUS=1 \ cd ../ZTS : Minimal load test for ZTS extension %{__ztsphp} --no-php-ini \ - --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ + --define extension=$PWD/modules/%{pecl_name}.so \ --define sp.allow_broken_configuration=1 \ --modules | grep %{pecl_name} @@ -213,6 +218,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Mon Sep 3 2018 Remi Collet - 0.4.0-2 +- add patch for PHP 7.3 on 32-bit from + https://github.com/nbs-system/snuffleupagus/pull/242 + * Sat Sep 1 2018 Remi Collet - 0.4.0-1 - update to 0.4.0 - open https://github.com/nbs-system/snuffleupagus/issues/236 -- cgit