diff options
| -rw-r--r-- | php-Faker-github-pull-request-1348.patch (renamed from 1348.patch) | 0 | ||||
| -rw-r--r-- | php-Faker-github-pull-request-1365.patch (renamed from 1365.patch) | 0 | ||||
| -rw-r--r-- | php-Faker.spec | 30 |
3 files changed, 22 insertions, 8 deletions
diff --git a/1348.patch b/php-Faker-github-pull-request-1348.patch index 635da1b..635da1b 100644 --- a/1348.patch +++ b/php-Faker-github-pull-request-1348.patch diff --git a/1365.patch b/php-Faker-github-pull-request-1365.patch index cd1f506..cd1f506 100644 --- a/1365.patch +++ b/php-Faker-github-pull-request-1365.patch diff --git a/php-Faker.spec b/php-Faker.spec index c0f25ce..81ab526 100644 --- a/php-Faker.spec +++ b/php-Faker.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-Faker # -# Copyright (c) 2012-2017 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2012-2019 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -31,13 +31,16 @@ Version: %{github_version} Release: 3%{?dist} Summary: A PHP library that generates fake data -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/fzaninotto/Faker/pull/1348.patch -Patch1: https://patch-diff.githubusercontent.com/raw/fzaninotto/Faker/pull/1365.patch +# https://github.com/fzaninotto/Faker/pull/1348 +# https://patch-diff.githubusercontent.com/raw/fzaninotto/Faker/pull/1348.patch +Patch0: %{name}-github-pull-request-1348.patch +# https://github.com/fzaninotto/Faker/pull/1365 +# https://patch-diff.githubusercontent.com/raw/fzaninotto/Faker/pull/1365.patch +Patch1: %{name}-github-pull-request-1365.patch # remirepo:3 # For test build on all available arch @@ -123,8 +126,6 @@ cat <<'AUTOLOAD' | tee src/Faker/autoload.php /** * Autoloader for %{name} and its' dependencies * (created by %{name}-%{version}-%{release}). - * - * @return \Symfony\Component\ClassLoader\ClassLoader */ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; @@ -151,8 +152,16 @@ require_once '%{buildroot}%{phpdir}/Faker/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Faker\\Test\\', dirname(__DIR__).'/test/Faker'); EOF +# Skip flakey test that randomly fails even after patch from +# https://github.com/fzaninotto/Faker/issues/1498 is applied +# +# Faker\Test\Provider\DateTimeTest::testFixedSeedWithMaximumTimestamp +# InvalidArgumentException: Start date must be anterior to end date. +sed 's/function testFixedSeedWithMaximumTimestamp/function SKIP_testFixedSeedWithMaximumTimestamp/' \ + -i test/Faker/Provider/DateTimeTest.php + ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -172,9 +181,14 @@ exit $ret %changelog +* Thu Feb 14 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.7.1-7 +- Fix FTBFS by skipping flakey test (RHBZ #1605437 / RHBZ #1675661) +- Reference patches locally +- Remove invalid phpdoc @return from autoloader + * Tue Nov 28 2017 Remi Collet <remi@remirepo.net> - 1.7.1-3 - run full test suite on all arches -- add patch for 32-bits from +- add patch for 32-bit from https://github.com/fzaninotto/Faker/pull/1348 - add patch for big endian from https://github.com/fzaninotto/Faker/pull/1365 |