diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-11-06 19:18:20 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-11-06 19:18:20 +0100 |
| commit | 0a0c4502ca300f65419e9b6c98b66b7a60f12ad3 (patch) | |
| tree | d3ce644420ce4cb8978a127606233093bedd68cb /php-Monolog.spec | |
| parent | 0c6fab3d6aba2e61e38f8a07c963a9a678096e39 (diff) | |
php-Monolog: fix tests (backported from Fedora)
Diffstat (limited to 'php-Monolog.spec')
| -rw-r--r-- | php-Monolog.spec | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/php-Monolog.spec b/php-Monolog.spec index 4c89097..82ccf9e 100644 --- a/php-Monolog.spec +++ b/php-Monolog.spec @@ -22,7 +22,7 @@ %global php_min_ver 5.3.0 # "psr/log": "~1.0" # NOTE: Min version not 1.0 because autoloader required -%global psrlog_min_ver 1.0.0-8 +%global psrlog_min_ver 1.0.1 %global psrlog_max_ver 2.0 # "raven/raven": "^0.13" %global raven_min_ver 0.13 @@ -42,7 +42,7 @@ Name: php-Monolog Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Sends your logs to files, sockets, inboxes, databases and various web services Group: Development/Libraries @@ -50,6 +50,12 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz +# Fix tests for sentry/sentry >= 0.16.0 (and < 1.0) +# +# Patch adapted for Monolog version 1.21.0 from +# https://github.com/Seldaek/monolog/pull/880 +Patch0: %{name}-tests-sentry-gte-0-16-0.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Tests @@ -57,9 +63,7 @@ BuildArch: noarch ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) -#BuildRequires: php-composer(psr/log) >= %%{psrlog_min_ver} -BuildRequires: php-PsrLog >= %{psrlog_min_ver} -BuildRequires: php-composer(psr/log) < %{psrlog_max_ver} +BuildRequires: php-composer(psr/log) >= %{psrlog_min_ver} ## optional BuildRequires: php-composer(swiftmailer/swiftmailer) >= %{swift_min_ver} BuildRequires: php-composer(raven/raven) >= %{raven_min_ver} @@ -83,8 +87,7 @@ BuildRequires: php-composer(symfony/class-loader) # composer.json Requires: php(language) >= %{php_min_ver} -#Requires: php-composer(psr/log) >= %%{psrlog_min_ver} -Requires: php-PsrLog >= %{psrlog_min_ver} +Requires: php-composer(psr/log) >= %{psrlog_min_ver} Requires: php-composer(psr/log) < %{psrlog_max_ver} # phpcompatinfo (computed from version 1.21.0) Requires: php-curl @@ -148,6 +151,9 @@ at a later time. %prep %setup -qn %{github_name}-%{github_commit} +: Fix tests for sentry/sentry >= 0.16.0 +%patch0 -p1 + : Create autoloader cat <<'AUTOLOAD' | tee src/Monolog/autoload.php <?php @@ -229,7 +235,7 @@ if which php56; then run=1 fi if [ $run -eq 0 ]; then - %{_bindir}/phpunit --verbose --bootstrap bootstrap.php || ret =1 +%{_bindir}/phpunit --verbose --bootstrap bootstrap.php fi exit $ret; @@ -253,6 +259,10 @@ rm -rf %{buildroot} %changelog +* Sun Nov 06 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.21.0-2 +- Fix test suite for php-sentry >= 0.16.0 +- Modified php-psr-log dependency (min version 1.0.0-8 => 1.0.1) + * Mon Aug 08 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.21.0-1 - Updated to 1.21.0 (RHBZ #1362318) |