From 7b551c7f57510658d2d26ff2b0790fe5ec041982 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Feb 2019 11:15:06 +0100 Subject: [PATCH] v3.0.2 (cherry picked from commit d5f0934cf332a9cd7caedeaa766260071dedb137) --- .gitignore | 1 + php-sebastian-diff3.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3cc9190..a1d4c45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-sebastian-diff3-3.0.0-e091609.tar.gz /php-sebastian-diff3-3.0.1-366541b.tar.gz +/php-sebastian-diff3-3.0.2-720fcc7.tar.gz diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec index c83eb47..8b5fca3 100644 --- a/php-sebastian-diff3.spec +++ b/php-sebastian-diff3.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sebastian-diff3 # -# Copyright (c) 2013-2018 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 366541b989927187c4ca70490a35615d3fef2dce +%global gh_commit 720fcc7e9b5cf384ea68d9d930d480907a0c1a29 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -27,8 +27,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.1 -Release: 2%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Diff implementation License: BSD @@ -42,9 +42,9 @@ BuildRequires: php(language) >= 7.1 BuildRequires: php-pcre BuildRequires: php-spl # from composer.json, "require-dev": { -# "phpunit/phpunit": "^7.0", +# "phpunit/phpunit": "^7.5 || ^8.0", # "symfony/process": "^2 || ^3.3 || ^4" -BuildRequires: phpunit7 +BuildRequires: phpunit7 >= 7.5 BuildRequires: php-symfony4-process %endif @@ -112,6 +112,9 @@ exit $ret %changelog +* Mon Feb 4 2019 Remi Collet - 3.0.2-1 +- update to 3.0.2 + * Fri Jul 13 2018 Fedora Release Engineering - 3.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index e8bdb09..3f495ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-diff3-3.0.1-366541b.tar.gz) = 5b20df091e50d0e6b51e6f462800bd4d3acd240e5bb6affcdb4c884feee86462ec51152f5a294f75067634657093b8c50eb6da56169dd08f994fc2517b0039d3 +SHA512 (php-sebastian-diff3-3.0.2-720fcc7.tar.gz) = 23a72319b76203a94d9edd14f8d960c9c489773ba9ec2bd7c8fb067332454ff9f83cba620e66da136d963d5599012cf42829c5d5913dd2bad44ed41c69ff9cba