From 2a5391fb59d622eee50147186f0129a584189483 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 31 Oct 2020 08:18:02 +0100 Subject: update to 2.0.4 --- composer.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'composer.spec') diff --git a/composer.spec b/composer.spec index f1f0043..12a2af6 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit f7eebdd092873f5d63929f21183e69ec9f5e83cd +%global gh_commit 4053eab90a7cdf0b81dd93073dc6c18c15d487fd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.3 +%global upstream_version 2.0.4 #global upstream_prever RC2 #global upstream_lower rc2 @@ -285,12 +285,18 @@ rm -rf res : Run test suite export BUILDROOT=%{buildroot} +%if 0%{?rhel} == 6 +FILTER="--filter '^((?!(testIntegration|testArchiveCustomFileName|testArchiveTar)).)*$'" +%else +FILTER="--filter '^((?!(testIntegration)).)*$'" +%endif + # testIntegration may hang on local build ret=0 for cmd in php php72 php73 php74; do if which $cmd; then $cmd -d memory_limit=1G %{_phpunit} \ - --filter '^((?!(testIntegration)).)*$' \ + $FILTER \ --include-path %{buildroot}%{_datadir}/php || ret=1 fi done @@ -312,6 +318,9 @@ exit $ret %changelog +* Sat Oct 31 2020 Remi Collet - 2.0.4-1 +- update to 2.0.4 + * Thu Oct 29 2020 Remi Collet - 2.0.3-1 - update to 2.0.3 -- cgit