The package rpms/php-Faker.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/php-Faker.git/commit/?id=bdd9727f....
Change:
+%ifarch ppc64 s390x
Thanks.
Full change:
============
commit bdd9727fe49ab2b77fcb7e1110cc1b70f8f1db6e
Author: Remi Collet <remi(a)fedoraproject.org>
Date: Fri Nov 10 10:41:46 2017 +0100
Update to 1.7.1
fix erratic FTBFS from Koschei
skip 1 test on BigEndian
https://github.com/fzaninotto/Faker/issues/1346
ignore test results on 32-bit
https://github.com/fzaninotto/Faker/issues/1347
diff --git a/.gitignore b/.gitignore
index 317dc18..3d491af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
/php-Faker-1.4.0-010c7efedd88bf31141a02719f51fb44c732d5a0.tar.gz
/php-Faker-1.5.0-d0190b156bcca848d401fb80f31f504f37141c8d.tar.gz
/php-Faker-1.6.0-44f9a286a04b80c76a4e5fb7aad8bb539b920123.tar.gz
+/php-Faker-1.7.1-d3ed4cc37051c1ca52d22d76b437d14809fc7e0d.tar.gz
diff --git a/php-Faker-upstream.patch b/php-Faker-upstream.patch
deleted file mode 100644
index bda2a97..0000000
--- a/php-Faker-upstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 19dcb9039ec3df9776af23aebd9de5c8d0de3946 Mon Sep 17 00:00:00 2001
-From: oittaa <oittaa(a)users.noreply.github.com>
-Date: Thu, 6 Oct 2016 23:59:25 +0300
-Subject: [PATCH] [UuidTest.php] Don't use mt_srand() directly.
-
----
- test/Faker/Provider/UuidTest.php | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/Faker/Provider/UuidTest.php b/test/Faker/Provider/UuidTest.php
-index fceb8df..22f9efb 100644
---- a/test/Faker/Provider/UuidTest.php
-+++ b/test/Faker/Provider/UuidTest.php
-@@ -2,6 +2,7 @@
-
- namespace Faker\Test\Provider;
-
-+use Faker\Generator;
- use Faker\Provider\Uuid as BaseProvider;
-
- class UuidTest extends \PHPUnit_Framework_TestCase
-@@ -14,7 +15,8 @@ public function testUuidReturnsUuid()
-
- public function testUuidExpectedSeed()
- {
-- mt_srand(123);
-+ $faker = new Generator();
-+ $faker->seed(123);
- $this->assertEquals("8e2e0c84-50dd-367c-9e66-f3ab455c78d6",
BaseProvider::uuid());
- $this->assertEquals("073eb60a-902c-30ab-93d0-a94db371f6c8",
BaseProvider::uuid());
- }
-From 89135d0fe594ec7f3e82ef084242df09b88f6fd8 Mon Sep 17 00:00:00 2001
-From: oittaa <oittaa(a)users.noreply.github.com>
-Date: Thu, 6 Oct 2016 23:32:59 +0300
-Subject: [PATCH] [Generator.php] mt_rand() changed in PHP 7.1
-
----
- src/Faker/Generator.php | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/Faker/Generator.php b/src/Faker/Generator.php
-index cb13cd0..9496bca 100644
---- a/src/Faker/Generator.php
-+++ b/src/Faker/Generator.php
-@@ -188,7 +188,11 @@ public function seed($seed = null)
- if ($seed === null) {
- mt_srand();
- } else {
-- mt_srand((int) $seed);
-+ if (PHP_VERSION_ID < 70100) {
-+ mt_srand((int) $seed);
-+ } else {
-+ mt_srand((int) $seed, MT_RAND_PHP);
-+ }
- }
- }
-
diff --git a/php-Faker.spec b/php-Faker.spec
index b84c2e2..5934b39 100644
--- a/php-Faker.spec
+++ b/php-Faker.spec
@@ -11,8 +11,8 @@
%global github_owner fzaninotto
%global github_name Faker
-%global github_version 1.6.0
-%global github_commit 44f9a286a04b80c76a4e5fb7aad8bb539b920123
+%global github_version 1.7.1
+%global github_commit d3ed4cc37051c1ca52d22d76b437d14809fc7e0d
%global composer_vendor fzaninotto
%global composer_project faker
@@ -27,7 +27,7 @@
Name: php-%{github_name}
Version: %{github_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: A PHP library that generates fake data
Group: Development/Libraries
@@ -35,9 +35,6 @@ License: MIT
URL:
https://github.com/%{github_owner}/%{github_name}
Source0:
%{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
-# For PHP 7.1
-Patch0: %{name}-upstream.patch
-
BuildArch: noarch
# Tests
%if %{with_tests}
@@ -100,9 +97,6 @@ Optional:
%prep
%setup -qn %{github_name}-%{github_commit}
-%patch0 -p1 -b .upstream
-find src -name \*upstream -exec rm {} \; -print
-
%if 0%{?el6}
# For old PHPUnit
for test in $(find test -name \*Test.php); do
@@ -144,24 +138,23 @@ require_once '%{buildroot}%{phpdir}/Faker/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Faker\\Test\\',
dirname(__DIR__).'/test/Faker');
EOF
-: Skip tests that require downloading content
-sed -e 's/function testDownloadWithDefaults/function
SKIP_testDownloadWithDefaults/' \
- -i test/Faker/Provider/ImageTest.php
-: Skip bad test see
https://github.com/fzaninotto/Faker/issues/1146
-sed -e 's/func testIpv4NotLocalNetwork/func SKIP_testIpv4NotLocalNetwork/' \
- -i test/Faker/Provider/InternetTest.php
-: Skip tests with erratic results in Koschei
-sed -e '/561059108101825/d' \
- -e '/601100099013942/d' \
- -i test/Faker/Calculator/LuhnTest.php
+%ifarch ppc64 s390x
+# see
https://github.com/fzaninotto/Faker/issues/1346
+rm -f test/Faker/Provider/UuidTest.php
+%endif
ret=0
-for cmd in php56 php70 php71 php; do
+for cmd in php php56 php70 php71 php72; do
if which $cmd; then
$cmd %{_bindir}/phpunit --verbose || ret=1
fi
done
+%if %{__isa_bits} < 64
+: ignore test suite results
https://github.com/fzaninotto/Faker/issues/1347
+%else
exit $ret
+%endif
+
%else
: Tests skipped
%endif
@@ -176,6 +169,14 @@ exit $ret
%changelog
+* Fri Nov 10 2017 Remi Collet <remi(a)remirepo.net> - 1.7.1-1
+- Update to 1.7.1
+- fix erratic FTBFS from Koschei
+- skip 1 test on BigEndian
+
https://github.com/fzaninotto/Faker/issues/1346
+- ignore test results on 32-bit
+
https://github.com/fzaninotto/Faker/issues/1347
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.6.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 9f22366..2de9825 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-Faker-1.6.0-44f9a286a04b80c76a4e5fb7aad8bb539b920123.tar.gz) =
a8da038b0275b0c6f05726d8a27493ff9c14522ea0e69f6662c4622fe4ff7408bfe491eaddd9d313516781c327e016c1128121a4b8f5bf54b59a21aaa7899c0d
+SHA512 (php-Faker-1.7.1-d3ed4cc37051c1ca52d22d76b437d14809fc7e0d.tar.gz) =
322b0d65cc83b57179108dc6b18a97dc1df71b905b63033410ed6694c613b91043e39046bf86b15075b2d7568539dc7d342a4ec9e4eacb8e7497d24a89f5c056