diff options
| author | Remi Collet <remi@remirepo.net> | 2020-05-31 07:59:22 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-05-31 07:59:22 +0200 |
| commit | d46ba64e1acd03746b91d1d05a6216fa803ecf32 (patch) | |
| tree | d63f7a06c0f8b0df7abc1dd636db489d0edea812 /unit-php.spec | |
| parent | 60b25188efaf2ae2b8d240b94148c52985b6ec27 (diff) | |
update to 1.18.0
drop patches merged upstream
Diffstat (limited to 'unit-php.spec')
| -rw-r--r-- | unit-php.spec | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/unit-php.spec b/unit-php.spec index 647766c..be1835c 100644 --- a/unit-php.spec +++ b/unit-php.spec @@ -9,7 +9,7 @@ %global gh_owner nginx %global project unit -%global gh_commit 4d62989f5c2329bb4a6174e4b7fb4ab6d8d9ec9f +%global gh_commit d3ca5fb47a52322b48737d21d55bf1d6d0aa446a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %undefine _debugsource_packages @@ -34,17 +34,14 @@ Requires: %{scl_prefix}php-embedded %endif Name: %{?scl_prefix}%{project}-php -Version: 1.17.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.18.0 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP module for NGINX Unit License: ASL 2.0 URL: https://unit.nginx.org/ Source0: https://github.com/%{gh_owner}/%{project}/archive/%{gh_commit}/%{project}-%{version}-%{gh_short}.tar.gz -Patch0: 0001-fix-lib-name-for-PHP-8.patch -Patch1: 0002-define-TSRMLS_-macro-dropped-in-PHP-8.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-embedded @@ -63,8 +60,6 @@ and NGINX unit %{version}. %prep %setup -qn %{project}-%{gh_commit} -%patch0 -p1 -%patch1 -p1 %build @@ -123,6 +118,10 @@ make %{modname}-install DESTDIR=%{buildroot} %changelog +* Sun May 31 2020 Remi Collet <remi@remirepo.net> - 1.18.0-1 +- update to 1.18.0 +- drop patches merged upstream + * Fri Apr 17 2020 Remi Collet <remi@remirepo.net> - 1.17.0-2 - fix build with PHP 8 using patches from https://github.com/nginx/unit/pull/425 |