diff options
| author | Remi Collet <remi@remirepo.net> | 2018-06-28 15:04:16 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-06-28 15:04:16 +0200 |
| commit | da12d6eef4de8315b49a0f135cb3d842b5cf58fa (patch) | |
| tree | 29e69f0c745b7d3e6c3f9cf06e023f004c074db7 /php-pecl-yac.spec | |
| parent | 5e8ad79f04a3724e73c8fd4c3cde207d821d12c1 (diff) | |
add patch for PHP 7.3 from https://github.com/laruence/yac/pull/89
Diffstat (limited to 'php-pecl-yac.spec')
| -rw-r--r-- | php-pecl-yac.spec | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/php-pecl-yac.spec b/php-pecl-yac.spec index c252a64..594af57 100644 --- a/php-pecl-yac.spec +++ b/php-pecl-yac.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-yac (previously php-yac) # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -36,14 +36,16 @@ Version: 2.0.2 Release: 0.8.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %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;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif License: PHP -Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} +Patch0: https://patch-diff.githubusercontent.com/raw/laruence/yac/pull/89.patch + +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear %if %{with_fastlz} @@ -67,12 +69,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} @@ -122,6 +118,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr89 + %if %{with_fastlz} sed -e '\:name="compressor/fastlz:d' -i ../package.xml rm -r compressor/fastlz @@ -156,6 +154,8 @@ cp -pr NTS ZTS %build +%{?dtsenable} + peclconf() { %configure \ %if %{with_fastlz} @@ -178,6 +178,8 @@ make %{?_smp_mflags} %install +%{?dtsenable} + # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -237,7 +239,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -272,6 +274,10 @@ fi %changelog +* Thu Jun 28 2018 Remi Collet <remi@remirepo.net> - 2.0.2-2 +- add patch for PHP 7.3 from + https://github.com/laruence/yac/pull/89 + * Tue Aug 1 2017 Remi Collet <remi@remirepo.net> - 2.0.2-1 - Update to 2.0.2 |