diff options
author | Remi Collet <remi@remirepo.net> | 2017-12-23 17:55:05 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2017-12-23 17:55:05 +0100 |
commit | 89bc3e4440e059a9b2178558bcc01a1a77d82a2a (patch) | |
tree | 5fa24db8587081ef8bf11e6b0c5b19b53e49c010 /phinx.spec | |
parent | 75a7c6f81389f8ca35fef2676a453f034884c683 (diff) |
Update to 0.9.2
open https://github.com/cakephp/phinx/pull/1278 fix tests
use phpunit6 on Fedora
allow Symfony 4
Diffstat (limited to 'phinx.spec')
-rw-r--r-- | phinx.spec | 71 |
1 files changed, 45 insertions, 26 deletions
@@ -6,21 +6,22 @@ # # Please, preserve the changelog entries # -%global gh_commit c1d51fd065af3aa3fabd684ce561cd9c38281eb8 +%global gh_commit e1698319ad55157c233b658c08f7a10617e797ca %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner robmorgan #global gh_date 20150820 %global gh_project phinx %global psr0 Phinx -%if 0%{?rhel} == 5 -# 3 failures on EL-5 related to sqlite -%global with_tests 0%{?_with_tests:1} -%else %global with_tests 0%{!?_without_tests:1} + +%if 0%{?fedora} >= 27 +%global symfony_max 5 +%else +%global symfony_max 4 %endif Name: %{gh_project} -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: Manage the database migrations for your PHP app @@ -31,39 +32,45 @@ Source0: %{name}-%{version}-%{?gh_short}.tgz Source1: %{name}-autoload.php Source2: makesrc.sh +# hardcode version instead of read it from composer.json +Patch0: %{name}-version.patch +# https://github.com/cakephp/phinx/pull/1278 +Patch1: %{name}-tests.patch + BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.4 -BuildRequires: php-composer(symfony/console) < 4 -BuildRequires: php-composer(symfony/console) >= 2.8 -BuildRequires: php-composer(symfony/config) < 4 -BuildRequires: php-composer(symfony/config) >= 2.8 -BuildRequires: php-composer(symfony/yaml) < 4 -BuildRequires: php-composer(symfony/yaml) >= 2.8 +BuildRequires: php-composer(symfony/console) < %{symfony_max} +BuildRequires: php-composer(symfony/config) < %{symfony_max} +BuildRequires: php-composer(symfony/yaml) < %{symfony_max} BuildRequires: php-pdo BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl # For tests, from composer.json "require-dev": { -# "phpunit/phpunit": "^4.8.26|^5.0" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8.26 +# "phpunit/phpunit": "^4.8.35|^5.7|^6.5" +# "cakephp/cakephp-codesniffer": "^3.0" +%if 0%{?fedora} >= 26 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit6 +%else +%global phpunit %{_bindir}/phpunit +BuildRequires: php-phpunit-PHPUnit >= 4.8.35 +%endif %endif # For autoloader BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=5.4", -# "symfony/console": "~2.8|~3.0", -# "symfony/config": "~2.8|~3.0", -# "symfony/yaml": "~2.8|~3.0" +# "symfony/console": "~2.8|~3.0|^4.0", +# "symfony/config": "~2.8|~3.0|^4.0", +# "symfony/yaml": "~2.8|~3.0|^4.0" Requires: php(language) >= 5.4 -Requires: php-composer(symfony/console) < 4 -Requires: php-composer(symfony/console) >= 2.8 -Requires: php-composer(symfony/config) < 4 -Requires: php-composer(symfony/config) >= 2.8 -Requires: php-composer(symfony/yaml) < 4 -Requires: php-composer(symfony/yaml) >= 2.8 +Requires: php-composer(symfony/console) < %{symfony_max} +Requires: php-composer(symfony/config) < %{symfony_max} +Requires: php-composer(symfony/yaml) < %{symfony_max} # From phpcompatinfo report for 0.6.4 Requires: php-pdo Requires: php-date @@ -90,6 +97,11 @@ Documentation: http://docs.phinx.org %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p0 +sed -e 's/@VERSION@/%{version}/' \ + -i src/Phinx/Console/PhinxApplication.php + +%patch1 -p0 -b .old cp %{SOURCE1} src/%{psr0}/autoload.php @@ -135,9 +147,10 @@ sed -e '/_ENABLED/s/true/false/;/SQLITE_ENABLED/s/false/true/' \ : Run upstream test suite ret=0 -for cmd in php php56 php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1 +for cmd in "php %{phpunit}" php70 php71 php72; do + if which $cmd; then + set $cmd + $1 ${2:-%{_bindir}/phpunit6} --no-coverage || ret=1 fi done exit $ret @@ -157,6 +170,12 @@ exit $ret %changelog +* Sat Dec 23 2017 Remi Collet <remi@remirepo.net> - 0.9.2-1 +- Update to 0.9.2 +- open https://github.com/cakephp/phinx/pull/1278 fix tests +- use phpunit6 on Fedora +- allow Symfony 4 + * Sun Sep 10 2017 Remi Collet <remi@remirepo.net> - 0.9.1-1 - Update to 0.9.1 |