diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-04-08 08:30:13 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-04-08 08:30:13 +0200 |
| commit | fafc70fee6c65efe94066fe3fe97a35ed8a245cc (patch) | |
| tree | 057144177ae535f42f98bda0a7b87a1b53583d3b | |
| parent | 6ff7593e004f0d57fe6f8a6461f0c0663ec011c0 (diff) | |
php-zendframework-zend-inputfilter: 2.7.0
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | php-zendframework-zend-inputfilter.spec | 24 |
2 files changed, 22 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 730a651..f8ec98d 100644 --- a/composer.json +++ b/composer.json @@ -30,8 +30,12 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + }, + "zf": { + "component": "Zend\\InputFilter", + "config-provider": "Zend\\InputFilter\\ConfigProvider" } }, "autoload-dev": { diff --git a/php-zendframework-zend-inputfilter.spec b/php-zendframework-zend-inputfilter.spec index 8f3b5fa..03b1d4d 100644 --- a/php-zendframework-zend-inputfilter.spec +++ b/php-zendframework-zend-inputfilter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit a6833aeabc9fcaf5bb17c3a33130ae79b3aa133a +%global gh_commit 3d6c8dab9780c63d14c5649f83a7fbbadc9d16c8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-inputfilter @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.1 +Version: 2.7.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -99,12 +99,6 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library} %check %if %{with_tests} -if %{_bindir}/phpunit --atleast-version 5 -then - : Skip test suite because PHPUnit is too recent - exit 0 -fi - mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php @@ -118,8 +112,19 @@ Zend\Loader\AutoloaderFactory::factory(array( require_once '%{php_home}/Zend/autoload.php'; EOF +if %{_bindir}/phpunit --atleast-version 5 +then + # remirepo:3 + if [ -x "$PHPUNIT" ]; then + $PHPUNIT --include-path=%{buildroot}%{php_home} + fi + : Skip test suite because PHPUnit is too recent + exit 0 +fi + %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} +# remirepo:3 if which php70; then php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} fi @@ -142,6 +147,9 @@ rm -rf %{buildroot} %changelog +* Fri Apr 8 2016 Remi Collet <remi@fedoraproject.org> - 2.7.0-1 +- update to 2.7.0 + * Thu Apr 7 2016 Remi Collet <remi@fedoraproject.org> - 2.6.1-1 - update to 2.6.1 |