From 27108801e18fcedcfd6883c34c7168b022252cbb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Jun 2018 12:56:34 +0200 Subject: update to 0.10.0 drop patch merged upstream raise dependency on PHP 5.6 add dependency on cakephp/collection add dependency on cakephp/database use range dependencies on F27+ --- phinx.spec | 88 +++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 29 deletions(-) (limited to 'phinx.spec') diff --git a/phinx.spec b/phinx.spec index a1fe183..37bf3fd 100644 --- a/phinx.spec +++ b/phinx.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit e1698319ad55157c233b658c08f7a10617e797ca +%global gh_commit 21aaad6001e663d0296235d0507ffa4bd8c0d9ce %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner robmorgan #global gh_date 20150820 @@ -14,14 +14,8 @@ %global psr0 Phinx %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.2 +Version: 0.10.0 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: Manage the database migrations for your PHP app @@ -34,43 +28,63 @@ 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) < %{symfony_max} -BuildRequires: php-composer(symfony/config) < %{symfony_max} -BuildRequires: php-composer(symfony/yaml) < %{symfony_max} +BuildRequires: php(language) >= 5.6 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(cakephp/collection) >= 3.6 with php-composer(cakephp/collection) < 4) +BuildRequires: (php-composer(cakephp/database) >= 3.6 with php-composer(cakephp/database) < 4) +BuildRequires: (php-composer(symfony/console) >= 2.8 with php-composer(symfony/console) < 5) +BuildRequires: (php-composer(symfony/config) >= 2.8 with php-composer(symfony/config) < 5) +BuildRequires: (php-composer(symfony/yaml) >= 2.8 with php-composer(symfony/yaml) < 5) +%else +BuildRequires: php-cakephp-collection >= 3.6 +BuildRequires: php-cakephp-database >= 3.6 +BuildRequires: php-symfony3-console +BuildRequires: php-symfony3-config +BuildRequires: php-symfony3-yaml +%endif 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.35|^5.7|^6.5" -# "cakephp/cakephp-codesniffer": "^3.0" -%if 0%{?fedora} >= 26 +# "phpunit/phpunit": ">=5.7", +# "sebastian/comparator": ">=1.2.3", +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit6 BuildRequires: phpunit6 %else %global phpunit %{_bindir}/phpunit -BuildRequires: php-phpunit-PHPUnit >= 4.8.35 +BuildRequires: php-phpunit-PHPUnit >= 5.7 %endif %endif # For autoloader BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { -# "php": ">=5.4", +# "php": ">=5.6", +# "cakephp/collection": "^3.6", +# "cakephp/database": "^3.6", # "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) < %{symfony_max} -Requires: php-composer(symfony/config) < %{symfony_max} -Requires: php-composer(symfony/yaml) < %{symfony_max} +Requires: php(language) >= 5.6 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(cakephp/collection) >= 3.6 with php-composer(cakephp/collection) < 4) +Requires: (php-composer(cakephp/database) >= 3.6 with php-composer(cakephp/database) < 4) +Requires: (php-composer(symfony/console) >= 2.8 with php-composer(symfony/console) < 5) +Requires: (php-composer(symfony/config) >= 2.8 with php-composer(symfony/config) < 5) +Requires: (php-composer(symfony/yaml) >= 2.8 with php-composer(symfony/yaml) < 5) +%else +Requires: php-cakephp-collection >= 3.6 +Requires: php-cakephp-database >= 3.6 +Requires: php-symfony3-console +Requires: php-symfony3-config +Requires: php-symfony3-yaml +%endif # From phpcompatinfo report for 0.6.4 Requires: php-pdo Requires: php-date @@ -101,8 +115,6 @@ Documentation: http://docs.phinx.org sed -e 's/@VERSION@/%{version}/' \ -i src/Phinx/Console/PhinxApplication.php -%patch1 -p0 -b .old - cp %{SOURCE1} src/%{psr0}/autoload.php sed -e 's:../data/Phinx:data:' -i src/Phinx/Console/Command/Init.php @@ -126,8 +138,8 @@ EOF mkdir -p %{buildroot}%{_datadir}/php cp -pr src/%{psr0} %{buildroot}%{_datadir}/php/%{psr0} -: Default config file -install -Dpm 644 phinx.yml %{buildroot}%{_datadir}/php/%{psr0}/data/phinx.yml +: Default config files +cp -pr src/data/%{psr0} %{buildroot}%{_datadir}/php/%{psr0}/data : The command install -Dpm 755 phinx %{buildroot}%{_bindir}/phinx @@ -142,15 +154,25 @@ require '%{buildroot}%{_datadir}/php/%{psr0}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Test\\Phinx\\', dirname(__DIR__).'/tests/Phinx'); EOF +%if 0%{?rhel} == 6 +: SQLite is too old +sed -e '/_ENABLED/s/true/false/' \ + phpunit.xml.dist >phpunit.xml +%else sed -e '/_ENABLED/s/true/false/;/SQLITE_ENABLED/s/false/true/' \ phpunit.xml.dist >phpunit.xml +%endif : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" php70 php71 php72; do +for cmd in "php %{phpunit}" php71 php72 php73; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit6} --no-coverage || ret=1 + $1 ${2:-%{_bindir}/phpunit6} \ +%if 0%{?fedora} >= 28 + --filter '^((?!(testChangeColumnWithCommasInCommentsOrDefaultValue)).)*$' \ +%endif + --no-coverage || ret=1 fi done exit $ret @@ -170,6 +192,14 @@ exit $ret %changelog +* Mon Jun 11 2018 Remi Collet - 0.10.0-1 +- update to 0.10.0 +- drop patch merged upstream +- raise dependency on PHP 5.6 +- add dependency on cakephp/collection +- add dependency on cakephp/database +- use range dependencies on F27+ + * Sat Dec 23 2017 Remi Collet - 0.9.2-1 - Update to 0.9.2 - open https://github.com/cakephp/phinx/pull/1278 fix tests -- cgit