diff options
| -rw-r--r-- | composer-dev.json | 33 | ||||
| -rw-r--r-- | php-nette-neon-dev.spec | 40 |
2 files changed, 62 insertions, 11 deletions
diff --git a/composer-dev.json b/composer-dev.json new file mode 100644 index 0000000..deb8d84 --- /dev/null +++ b/composer-dev.json @@ -0,0 +1,33 @@ +{ + "name": "nette/neon", + "description": "Nette NEON: parser & generator for Nette Object Notation", + "homepage": "http://ne-on.org", + "license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"], + "authors": [ + { + "name": "David Grudl", + "homepage": "https://davidgrudl.com" + }, + { + "name": "Nette Community", + "homepage": "https://nette.org/contributors" + } + ], + "require": { + "php": ">=5.6.0", + "ext-iconv": "*" + }, + "require-dev": { + "nette/tester": "~2.0", + "tracy/tracy": "^2.3" + }, + "autoload": { + "classmap": ["src/"] + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } +} diff --git a/php-nette-neon-dev.spec b/php-nette-neon-dev.spec index 5606003..67eb85f 100644 --- a/php-nette-neon-dev.spec +++ b/php-nette-neon-dev.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 75699de201932e6de6b249824dc8c53d0f442cd5 +%global gh_commit c40c63f2afa4196844ac40d9d2a2cfb313f76906 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -17,7 +17,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.5 +Version: 2.4.0 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette NEON: parser and generator for Nette Object Notation @@ -33,23 +33,25 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-composer(theseer/autoload) %if %{with_tests} -BuildRequires: php(language) >= 5.3.1 +BuildRequires: php(language) >= 5.6 BuildRequires: php-iconv BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "nette/tester": "~1.4" +# "nette/tester": "~2.0", +# "tracy/tracy": "^2.3" +# ignore tester min version (pass with 1.7), ignore tracy (pass without) BuildRequires: php-composer(%{gh_owner}/tester) >= 1.4 %endif # from composer.json, "require": { -# "php": ">=5.3.1" +# "php": ">=5.6.0" # "ext-iconv": "*" -Requires: php(language) >= 5.3.1 +Requires: php(language) >= 5.6 Requires: php-iconv -# from phpcompatinfo report for version 2.3.3 +# from phpcompatinfo report for version 2.4.0 Requires: php-date Requires: php-json Requires: php-pcre @@ -95,12 +97,24 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; EOF : Run test suite in sources tree +# remirepo:13 +ret=0 +run=0 +if which php56; then + cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini + php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s || ret=1 + run=1 +fi +if which php71; then + cat /etc/opt/remi/php71/php.ini /etc/opt/remi/php71/php.d/*ini >php.ini + php71 %{_bindir}/nette-tester --colors 0 -p php71 -c ./php.ini tests -s || ret=1 + run=1 +fi +if [ $run -eq 0 ]; then %{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s - -if which php70; then - cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini - php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s +# remirepo:2 fi +exit $ret %else : Test suite disabled %endif @@ -120,6 +134,10 @@ rm -rf %{buildroot} %changelog +* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1 +- update to 2.4.0 +- raise dependency on PHP >= 5.6 + * Mon Jun 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.5-1 - update to 2.3.5 |