diff options
| author | Remi Collet <remi@remirepo.net> | 2020-05-19 10:22:25 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-05-19 10:22:25 +0200 |
| commit | 822052602398c57e79ae9d3fc7122e026b922e49 (patch) | |
| tree | a1bd751c454f0166cea3479a5749d7d5bedd4f0b /php-pecl-uopz.spec | |
| parent | 0fca34b575c39b90e6ca872c732179aa9af199bc (diff) | |
revert workaround for xdebug < 2.9.4
Diffstat (limited to 'php-pecl-uopz.spec')
| -rw-r--r-- | php-pecl-uopz.spec | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/php-pecl-uopz.spec b/php-pecl-uopz.spec index ab06f47..2add1b9 100644 --- a/php-pecl-uopz.spec +++ b/php-pecl-uopz.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-uopz # -# Copyright (c) 2014-2019 Remi Collet +# Copyright (c) 2014-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -24,15 +24,17 @@ Summary: User Operations for Zend Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 6.1.1 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP -URL: http://pecl.php.net/package/%{pecl_name} +URL: https://pecl.php.net/package/%{pecl_name} %if 0%{?gh_commit:1} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz %else -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif +Patch0: uopz-xdebug.patch + BuildRequires: %{?scl_prefix}php-devel > 7.1 BuildRequires: %{?scl_prefix}php-pear @@ -48,6 +50,7 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %endif +Conflicts: %{?scl_prefix}php-pecl-xdebug < 2.9.4 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff @@ -121,6 +124,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .revert + # Sanity check, really often broken extver=$(sed -n '/#define PHP_UOPZ_VERSION/{s/.* "//;s/".*$//;p}' uopz.h) if test "x${extver}" != "x%{version}"; then @@ -256,6 +261,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue May 19 2020 Remi Collet <remi@remirepo.net> - 6.1.1-4 +- revert workaround for xdebug < 2.9.4 + * Wed Sep 18 2019 Remi Collet <remi@remirepo.net> - 6.1.1-1 - update to 6.1.1 |