diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | php-latte.spec | 44 |
2 files changed, 15 insertions, 32 deletions
diff --git a/composer.json b/composer.json index 384f9b4..46a9c57 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,7 @@ }, "suggest": { "ext-mbstring": "to use filters like lower, upper, capitalize, ...", - "ext-fileinfo": "to use filter |datastream", - "ext-xml": "to use filters like length, substring, ..." + "ext-fileinfo": "to use filter |datastream" }, "conflict": { "nette/application": "<2.4.1" diff --git a/php-latte.spec b/php-latte.spec index 90a602b..fd20692 100644 --- a/php-latte.spec +++ b/php-latte.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit b62ee346467e1e2402a43c499cf6047fddc5d321 +%global gh_commit 7d207e620cfc1386fb7ccd8de403d5760f7ca655 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nette @@ -16,9 +16,9 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.4.3 +Version: 2.4.4 %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: Latte: the amazing template engine for PHP Group: Development/Libraries @@ -28,7 +28,6 @@ Source0: %{name}-%{version}-%{gh_short}.tgz # pull a git snapshot to get test sutie Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-composer(theseer/autoload) %if %{with_tests} @@ -42,7 +41,6 @@ BuildRequires: php-mbstring BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl -BuildRequires: php-tokenizer BuildRequires: php-xml # From composer.json, "require-dev": { # "nette/tester": "~2.0", @@ -60,11 +58,9 @@ Requires: php-json Requires: php-tokenizer # from composer.json, "suggest": { # "ext-mbstring": "to use filters like lower, upper, capitalize, ...", -# "ext-fileinfo": "to use filter |datastream", -# "ext-xml": "to use filters like length, substring, ..." +# "ext-fileinfo": "to use filter |datastream" Requires: php-fileinfo Requires: php-mbstring -Requires: php-xml # from composer.json, "conflict": { # "nette/application": "<2.4" Conflicts: php-composer(%{gh_owner}/application) < 2.4.1 @@ -74,7 +70,7 @@ Requires: php-iconv Requires: php-pcre Requires: php-reflection Requires: php-spl -Requires: php-tokenizer +Requires: php-xml # provides latte/latte Provides: php-composer(%{gh_project}/%{gh_project}) = %{version} @@ -108,7 +104,6 @@ phpab --output src/%{ns_vendor}/autoload.php src %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{php_home} cp -pr src/* %{buildroot}%{php_home}/ @@ -126,34 +121,20 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/autoload.php'; EOF : Run test suite in sources tree -# remirepo:12 ret=0 -run=0 -if which php56; then - php56 %{_bindir}/nette-tester --colors 0 -p php56 -C -s || ret=1 - run=1 -fi -if which php71; then - rm tests/Latte/Filters.general.phpt - php71 %{_bindir}/nette-tester --colors 0 -p php71 -C -s || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/nette-tester --colors 0 -p php -C tests -s -# remirepo:2 -fi +# PHP 7.2: https://github.com/nette/latte/issues/162 +for cmd in php php56 php70 php71; do + if which $cmd; then + $cmd %{_bindir}/nette-tester --colors 0 -p $cmd -C -s || ret=1 + fi +done exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license license.md %doc readme.md contributing.md @@ -162,6 +143,9 @@ rm -rf %{buildroot} %changelog +* Mon May 22 2017 Remi Collet <remi@remirepo.net> - 2.4.4-1 +- Update to 2.4.4 + * Thu Jan 19 2017 Remi Collet <remi@fedoraproject.org> - 2.4.3-1 - update to 2.4.3 |