From 7685d0b8d6ece9c3d475a1754d5802a315a57b2d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Aug 2020 14:45:41 +0200 Subject: v5.5.1 from Fedora --- php-gettext-gettext.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'php-gettext-gettext.spec') diff --git a/php-gettext-gettext.spec b/php-gettext-gettext.spec index c1777c2..7df4409 100644 --- a/php-gettext-gettext.spec +++ b/php-gettext-gettext.spec @@ -13,8 +13,8 @@ Name: php-gettext-gettext -Version: 4.7.0 -Release: 2%{?dist} +Version: 5.5.1 +Release: 1%{?dist} BuildArch: noarch License: MIT @@ -25,8 +25,6 @@ Source0: %{url}/archive/v%{version}.tar.gz # dltests.sh is used to do this, and is included in this repository. Source1: tests-v%{version}.tar.bz2 -Patch0: https://patch-diff.githubusercontent.com/raw/oscarotero/Gettext/pull/230.patch - BuildRequires: dos2unix %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(gettext/languages) >= 2.3.0 with php-composer(gettext/languages) < 3) @@ -63,7 +61,6 @@ Autoloader: %{_datadir}/php/Gettext/autoload.php %prep %setup -a1 -n Gettext-%{version} -%patch0 -p1 # The documentation has the wrong newline codes dos2unix *.md @@ -96,7 +93,8 @@ cp -ar src/* %{buildroot}/%{_datadir}/php/Gettext/ %check -sed -i "s:include_once.*:\ninclude_once '%{buildroot}/%{_datadir}/php/Gettext/autoload.php';:" tests/bootstrap.php +# Upstream no longer contains tests/bootstrap.php file +#sed -i "s:include_once.*:\ninclude_once '%{buildroot}/%{_datadir}/php/Gettext/autoload.php';:" tests/bootstrap.php # gettext has some optional dependencies that we are not integrating with at this time (we can later # if desired). Thus, we need to skip the tests on these integration points since they will fail @@ -107,7 +105,7 @@ sed -i "s:include_once.*:\ninclude_once '%{buildroot}/%{_datadir}/php/Gettext/au ret=0 for cmd in php php71 php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit --bootstrap tests/bootstrap.php --filter ^\(\(?!\(testBlade\|testTwig\)\).\)*$ tests + $cmd %{_bindir}/phpunit --bootstrap %{buildroot}/%{_datadir}/php/Gettext/autoload.php tests fi done exit $ret @@ -124,6 +122,9 @@ exit $ret %changelog +* Fri Jul 24 2020 Sundeep Anand - 5.5.1-1 +- update to 5.5.1 (#1768669) + * Thu Oct 10 2019 Remi Collet - 4.7.0-2 - update to 4.7.0 - use range dependencies -- cgit