From 03ed9cefd048976c0e4cfd74de0489034ac81f93 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 09:33:16 +0200 Subject: switch --- php-nette-php-generator.spec | 65 +++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 19 deletions(-) (limited to 'php-nette-php-generator.spec') diff --git a/php-nette-php-generator.spec b/php-nette-php-generator.spec index 15b4d86..6d32b71 100644 --- a/php-nette-php-generator.spec +++ b/php-nette-php-generator.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit bbc8189aa54af093c908d98212e1c309b9170345 +%global gh_commit 3a69f606db7f1e9995347c7d84b9d2a0507c0b38 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -17,9 +17,9 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.6 +Version: 2.6.2 %global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette PHP Generator Group: Development/Libraries @@ -33,21 +33,23 @@ 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-pcre BuildRequires: php-reflection -BuildRequires: php-composer(%{gh_owner}/utils) >= 2.2 +BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4.2 # From composer.json, "require-dev": { -# "nette/tester": "~1.4" -BuildRequires: php-composer(%{gh_owner}/tester) >= 1.4 +# "nette/tester": "^2.0", +# "tracy/tracy": "^2.3" +# ignore tracy (pass without) +BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 %endif # from composer.json, "require": { -# "php": ">=5.3.1" -# "nette/utils": "~2.2" -Requires: php(language) >= 5.3.1 -Requires: php-composer(%{gh_owner}/utils) >= 2.2 -Requires: php-composer(%{gh_owner}/utils) < 3 +# "php": ">=5.6.0", +# "nette/utils": "^2.4.2 || ~3.0.0" +Requires: php(language) >= 5.6 +Requires: php-composer(%{gh_owner}/utils) >= 2.4.2 +Requires: php-composer(%{gh_owner}/utils) < 4 # from phpcompatinfo report for version 2.3.4 Requires: php-pcre Requires: php-reflection @@ -84,8 +86,6 @@ cp -pr src/* %{buildroot}%{php_home}/%{ns_vendor}/ %check %if %{with_tests} -: Generate configuration -cat /etc/php.ini /etc/php.d/*ini >php.ini export LANG=fr_FR.utf8 : Generate autoloader @@ -97,12 +97,22 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; EOF : Run test suite in sources tree -%{_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:11 +ret=0 +run=0 +if which php56; then + php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s || ret=1 + run=1 +fi +if which php71; then + php71 %{_bindir}/nette-tester --colors 0 -p php71 -C tests -s || ret=1 + run=1 fi +if [ $run -eq 0 ]; then +%{_bindir}/nette-tester --colors 0 -p php -C tests -s +# remirepo:2 +fi +exit $ret %else : Test suite disabled %endif @@ -122,6 +132,23 @@ rm -rf %{buildroot} %changelog +* Mon Mar 20 2017 Remi Collet - 2.6.2-1 +- Update to 2.6.2 + +* Wed Mar 15 2017 Remi Collet - 2.6.1-1 +- Update to 2.6.1 + +* Sun Feb 26 2017 Remi Collet - 2.6.0-1 +- update to 2.6.0 + +* Sun Jan 15 2017 Remi Collet - 2.5.0-1 +- update to 2.5.0 + +* Tue Aug 2 2016 Remi Collet - 2.4.1-1 +- update to 2.4.1 +- raise dependency on PHP >= 5.6 +- raise dependency on nette/utils >= 2.4 + * Mon Jun 20 2016 Remi Collet - 2.3.6-1 - update to 2.3.6 -- cgit