diff options
Diffstat (limited to 'php-snuffleupagus.spec')
| -rw-r--r-- | php-snuffleupagus.spec | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec index d08f0f2..0a3e139 100644 --- a/php-snuffleupagus.spec +++ b/php-snuffleupagus.spec @@ -35,7 +35,7 @@ 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: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif License: LGPLv3 Group: Development/Languages @@ -43,17 +43,12 @@ 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 +Patch1: https://patch-diff.githubusercontent.com/raw/nbs-system/snuffleupagus/pull/266.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: pcre-devel # For tests/upload_validation_real.phpt -%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 -%global python %{_root_bindir}/python3 -%else -%global python %{_root_bindir}/python -%endif -BuildRequires: %{python} BuildRequires: %{?scl_prefix}php-vld #BuildRequires: gdb #BuildRequires: php-debuginfo @@ -100,6 +95,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 +%patch1 -p1 -b .pr266 cd src # Sanity check, really often broken @@ -176,7 +172,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} rm src/tests/stream_wrapper.phpt %endif -sed -e 's:#!/usr/bin/python:#!%{python}:' -i scripts/upload_validation.py +sed -e 's:#!/usr/bin/env php:#!%{__php}:' -i scripts/upload_validation.php cd src : Minimal load test for NTS extension @@ -225,6 +221,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Dec 13 2018 Remi Collet <remi@remirepo.net> - 0.4.0-4 +- drop dependency on python, test build for + https://github.com/nbs-system/snuffleupagus/pull/266 + * Tue Dec 4 2018 Remi Collet <remi@remirepo.net> - 0.4.0-3 - EL-8 build |