From 3f893c70f484ebaafd63ea17ecbeb3e551bb37de Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 10:14:52 +0200 Subject: [PATCH] v4.0.4 (cherry picked from commit 11fd848a046eab76c655546d6777bc0599a62177) --- .gitignore | 2 ++ php-sebastian-diff4.spec | 24 ++++++++++++------------ sources | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 230b09a..76ddb35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /php-sebastian-diff4-4.0.0-c0c26c9.tar.gz /php-sebastian-diff4-4.0.1-3e523c5.tgz /php-sebastian-diff4-4.0.2-1e90b4c.tgz +/php-sebastian-diff4-4.0.3-ffc949a.tgz +/php-sebastian-diff4-4.0.4-3461e3f.tgz diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index 368bb86..2310b1b 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -6,8 +6,10 @@ # # Please, preserve the changelog entries # -%global bootstrap 0 -%global gh_commit 1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113 + +%bcond_without tests + +%global gh_commit 3461e3fccc7cfdfc2720be910d3bd73c69be590d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -20,16 +22,11 @@ %global major 4 %global php_home %{_datadir}/php -%if %{bootstrap} -%bcond_with tests -%else -%bcond_without tests -%endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.0.2 +Version: 4.0.4 Release: 1%{?dist} -Summary: Diff implementation +Summary: Diff implementation, version %{major} License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} @@ -43,14 +40,14 @@ BuildRequires: php(language) >= 7.3 BuildRequires: php-pcre BuildRequires: php-spl # from composer.json, "require-dev": { -# "phpunit/phpunit": "^9.0", +# "phpunit/phpunit": "^9.3", # "symfony/process": "^4.2 || ^5" -BuildRequires: phpunit9 +BuildRequires: phpunit9 >= 9.3 BuildRequires: php-symfony4-process %endif # from composer.json -# "php": "^7.3 || ^8.0" +# "php": ">=7.3" Requires: php(language) >= 7.3 # from phpcompatinfo report for version 4.0.0 Requires: php-pcre @@ -118,6 +115,9 @@ exit $ret %changelog +* Mon Oct 26 2020 Remi Collet - 4.0.4-1 +- update to 4.0.4 + * Tue Jun 30 2020 Remi Collet - 4.0.2-1 - update to 4.0.2 diff --git a/sources b/sources index d00483b..0d685c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-diff4-4.0.2-1e90b4c.tgz) = 933f2a1a058860294f7b0d18921722871c401bc98591b87a6dd41c95ee99fa520d5025b67833ebe793bfc9219665a9877bbd0b388de90fa33ed0aec7702b21d8 +SHA512 (php-sebastian-diff4-4.0.4-3461e3f.tgz) = 97b671978b27c9b2e0a9d0d45cba5ac343cd47e3cb84738170243f59d6eb72dfe240b3e148f4496fc40b3eb817e6ce8493dfb08a651b9da6af5aded9ece6ef1a