From 228f7d76d3e8f3da318e704676441b1760f16ab6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 May 2018 13:15:08 +0200 Subject: v4.5.0 from Fedora: * Sun May 20 2018 Randy Barlow - 4.5.0-1 - Update to 4.5.0 (#1571010). - https://github.com/oscarotero/Gettext/blob/v4.5.0/CHANGELOG.md --- ...-don-t-check-Po-file-content-on-bigendian.patch | 42 ---------------------- dltests.sh | 2 +- php-gettext-gettext.spec | 10 +++--- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 0000-don-t-check-Po-file-content-on-bigendian.patch diff --git a/0000-don-t-check-Po-file-content-on-bigendian.patch b/0000-don-t-check-Po-file-content-on-bigendian.patch deleted file mode 100644 index dc09460..0000000 --- a/0000-don-t-check-Po-file-content-on-bigendian.patch +++ /dev/null @@ -1,42 +0,0 @@ -From aadd696ee850da3e3e387dd32b9406905cd14e2b Mon Sep 17 00:00:00 2001 -From: Randy Barlow -Date: Mon, 15 Jan 2018 15:59:10 -0500 -Subject: [PATCH] don't check Po file content on bigendian - -Patch originally written by Remi Collet[0], and adapted for -Gettext 4.4.3 by Randy Barlow. - -Signed-off-by: Randy Barlow ---- - tests/AbstractTest.php | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/tests/AbstractTest.php b/tests/AbstractTest.php -index 42f54b6..42f419f 100644 ---- a/tests/AbstractTest.php -+++ b/tests/AbstractTest.php -@@ -51,7 +51,10 @@ abstract class AbstractTest extends PHPUnit_Framework_TestCase - $method = "to{$format}String"; - $content = file_get_contents(static::asset($file.'.'.static::$ext[$format])); - -- $this->assertSame($content, $translations->$method(), $file); -+ // Po reference files are LittleEndian -+ if ($format !== 'Mo' || self::isLittleEndian()) { -+ $this->assertSame($content, $translations->$method(), $file); -+ } - } - - protected static function saveContent(Translations $translations, $file, $format = null) -@@ -78,4 +81,9 @@ abstract class AbstractTest extends PHPUnit_Framework_TestCase - $this->assertSame($countTranslated, $translations->countTranslated()); - $this->assertContent($translations, $file); - } -+ -+ protected function isLittleEndian() -+ { -+ return pack("s", 0x3031) === "10"; -+ } - } --- -2.16.1 - diff --git a/dltests.sh b/dltests.sh index f27ee02..3979209 100755 --- a/dltests.sh +++ b/dltests.sh @@ -1,7 +1,7 @@ #!/bin/bash # This was borrowed from nodejs-grunt-contrib-concat -tag=v4.4.4 +tag=v4.5.0 set -e diff --git a/php-gettext-gettext.spec b/php-gettext-gettext.spec index d030284..df943bf 100644 --- a/php-gettext-gettext.spec +++ b/php-gettext-gettext.spec @@ -13,7 +13,7 @@ Name: php-gettext-gettext -Version: 4.4.4 +Version: 4.5.0 Release: 1%{?dist} BuildArch: noarch @@ -25,10 +25,6 @@ Source0: %{url}/archive/v%{version}/%{gh_project}-%{version}.tar.gz # dltests.sh is used to do this, and is included in this repository. Source1: tests-v%{version}.tar.bz2 -# Skip some tests on bigendian as reference file are littleendian -# https://github.com/oscarotero/Gettext/pull/159 -Patch0: 0000-don-t-check-Po-file-content-on-bigendian.patch - BuildRequires: dos2unix BuildRequires: php-composer(gettext/languages) >= 2.3.0 BuildRequires: php-composer(gettext/languages) < 3.0.0 @@ -111,6 +107,10 @@ phpunit --bootstrap tests/bootstrap.php --filter ^\(\(?!\(testBlade\|testTwig\)\ %changelog +* Sun May 20 2018 Randy Barlow - 4.5.0-1 +- Update to 4.5.0 (#1571010). +- https://github.com/oscarotero/Gettext/blob/v4.5.0/CHANGELOG.md + * Sun Feb 25 2018 Randy Barlow - 4.4.4-1 - Update to 4.4.4 (#1548216). - https://github.com/oscarotero/Gettext/blob/v4.4.4/CHANGELOG.md -- cgit