From 1e2a7bbd324856a4241f16d6f1c880f3a4bdec2c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 16 Mar 2018 11:01:30 +0100 Subject: update to 3.3.0 undefine __brp_mangle_shebangs --- atoum.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'atoum.spec') diff --git a/atoum.spec b/atoum.spec index 7117c76..e09193b 100644 --- a/atoum.spec +++ b/atoum.spec @@ -7,12 +7,16 @@ # # Please preserve changelog entries # -%global gh_commit 6f4ab88f3a1826aed2372c9f7f0d53b9303f672a + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + +%global gh_commit c5279d0ecd4e2d53af6b38815db2cafee8fc46b6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) Name: atoum -Version: 3.2.0 -Release: 2%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: PHP Unit Testing framework Group: Development/Libraries @@ -20,8 +24,6 @@ License: BSD URL: http://atoum.org Source0: https://github.com/%{name}/%{name}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz -Patch0: 754.patch - BuildArch: noarch BuildRequires: php(language) >= 5.6 @@ -42,7 +44,7 @@ BuildRequires: php-reflection BuildRequires: php-spl # From composer.json, "require": { -# "php": "^5.6.0 || ^7.0.0", +# "php": "^5.6.0 || ^7.0.0 <7.4.0", # "ext-hash": "*", # "ext-json": "*", # "ext-tokenizer": "*", @@ -65,7 +67,7 @@ Requires: php-pcre Requires: php-phar Requires: php-reflection Requires: php-spl -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: php-pecl-xdebug %endif @@ -110,7 +112,6 @@ Optional dependency: %prep %setup -qn %{name}-%{gh_commit} -%patch0 -p1 rm resources/configurations/.gitignore rm scripts/git/.tag tests/units/classes/scripts/git/.tag @@ -163,6 +164,10 @@ exit $ret %changelog +* Fri Mar 16 2018 Remi Collet - 3.3.0-1 +- update to 3.3.0 +- undefine __brp_mangle_shebangs + * Tue Oct 3 2017 Remi Collet - 3.2.0-2 - test build for https://github.com/atoum/atoum/pull/754 -- cgit