diff --git a/.gitignore b/.gitignore index 48ee352..10fa73c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /Gettext-4.4.3.tar.gz /Gettext-4.4.4.tar.gz /tests-v4.4.4.tar.bz2 +/Gettext-4.5.0.tar.gz +/tests-v4.5.0.tar.bz2 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 c821618..882eda5 100644 --- a/php-gettext-gettext.spec +++ b/php-gettext-gettext.spec @@ -3,7 +3,7 @@ Name: php-gettext-gettext -Version: 4.4.4 +Version: 4.5.0 Release: 1%{?dist} BuildArch: noarch @@ -15,10 +15,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 @@ -100,6 +96,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 diff --git a/sources b/sources index b8a8a0b..2b00101 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Gettext-4.4.4.tar.gz) = 54956b8d74ee775807bf1f793408205ea40f2c64b795598fbb86c839785d0fbe1c83ab7ee5d64988f0c9ad3cb1007da2c969f0452bb946555f852d85cad003ac -SHA512 (tests-v4.4.4.tar.bz2) = 2377cb980a35986421ce941f216da90911118706969a04d0266777c24719b6f8b96861352054b335e00005414766bb50af384a01d26ec35594e856adc7e913cf +SHA512 (Gettext-4.5.0.tar.gz) = 914fc0199283b73f028d36b0843694ae425424bd9e4ccc26438898511e639ddf48a9f9648dac385250b781858db585a52c30fb679366146b2de351eeaa1dc8d0 +SHA512 (tests-v4.5.0.tar.bz2) = 581f6beea795aba7ebf5586effcac2eba73f4167d38e0ab563babf365cc6d3e5ce6f590a9b26c966af19318beaf5010f2fc76939d63c688ebfc318551197bc09