diff options
Diffstat (limited to 'php-pecl-timecop.spec')
| -rw-r--r-- | php-pecl-timecop.spec | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/php-pecl-timecop.spec b/php-pecl-timecop.spec index 10ac6b0..8b07c70 100644 --- a/php-pecl-timecop.spec +++ b/php-pecl-timecop.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-timecop # -# Copyright (c) 2017-2018 Remi Collet +# Copyright (c) 2017-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -23,11 +23,16 @@ Summary: Time travel and freezing extension Name: %{?sub_prefix}php-pecl-timecop Version: 1.2.10 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +# https://github.com/hnw/php-timecop/pull/44 Support strict_types +Patch0: https://patch-diff.githubusercontent.com/raw/hnw/php-timecop/pull/44.patch +# https://github.com/hnw/php-timecop/pull/45 for ZTS +Patch1: https://patch-diff.githubusercontent.com/raw/hnw/php-timecop/pull/45.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -48,14 +53,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.1" Obsoletes: php71u-pecl-%{pecl_name} <= %{version} Obsoletes: php71w-pecl-%{pecl_name} <= %{version} @@ -94,6 +91,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr44 +%patch1 -p1 -b .pr45 # Sanity check, really often broken extver=$(sed -n '/#define PHP_TIMECOP_VERSION/{s/.* "//;s/".*$//;p}' php_timecop.h) @@ -247,6 +246,9 @@ fi %changelog +* Thu Feb 28 2019 Remi Collet <remi@remirepo.net> - 1.2.10-5 +- test build for pending PR + * Wed Dec 12 2018 Remi Collet <remi@remirepo.net> - 1.2.10-4 - ignore failing test with 7.3, reported as https://github.com/hnw/php-timecop/issues/42 |