summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-11-25 16:19:21 +0100
committerRemi Collet <remi@php.net>2021-11-25 16:19:21 +0100
commit797575d87210f4c97fe0d8d66f6c40078dd207c3 (patch)
treea8c73bd2ad55d8851868e7e6d12573ba6f207898
parent291717bfa863611ab06ef4e306a8a0432bd468e1 (diff)
update to 1.44.6 (no change)HEADmaster
drop patch merged upstream
-rw-r--r--php-twig.spec13
1 files changed, 7 insertions, 6 deletions
diff --git a/php-twig.spec b/php-twig.spec
index 8fc2888..8637c9a 100644
--- a/php-twig.spec
+++ b/php-twig.spec
@@ -16,8 +16,8 @@
%global github_owner twigphp
%global github_name Twig
-%global github_version 1.44.5
-%global github_commit dd4353357c5a116322e92a00d16043a31881a81e
+%global github_version 1.44.6
+%global github_commit ae39480f010ef88adc7938503c9b02d3baf2f3b3
%global github_short %(c=%{github_commit}; echo ${c:0:7})
# Lib
@@ -40,8 +40,6 @@ URL: http://twig.sensiolabs.org
Source0: %{name}-%{github_version}-%{github_short}.tgz
Source1: makesrc.sh
-Patch0: https://patch-diff.githubusercontent.com/raw/twigphp/Twig/pull/3563.patch
-
BuildArch: noarch
# as we use phpunit9 (for assertFileDoesNotExist)
BuildRequires: php-devel >= 7.3
@@ -125,7 +123,6 @@ Autoloader: %{phpdir}/Twig/autoload.php
%prep
%setup -qn %{github_name}-%{github_commit}
-%patch0 -p1
: Move the PSR-4 compat library
mv src lib/Twig/psr4
@@ -170,7 +167,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml
: Test suite without extension
ret=0
-for SCL in "php %{phpunit}" php73 php74 php80; do
+for SCL in "php %{phpunit}" php74 php80 php81; do
if which $SCL; then
set $SCL
$1 ${2:-%{_bindir}/phpunit9} $SKIP \
@@ -193,6 +190,10 @@ exit $RETURN_CODE
%changelog
+* Thu Nov 25 2021 Remi Collet <remi@remirepo.net> - 1.44.6-1
+- update to 1.44.6 (no change)
+- drop patch merged upstream
+
* Wed Sep 22 2021 Remi Collet <remi@remirepo.net> - 1.44.5-1
- update to 1.44.5
- add patch for test suite from https://github.com/twigphp/Twig/pull/3563