summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-08-30 06:36:26 +0200
committerRemi Collet <remi@remirepo.net>2017-08-30 06:36:26 +0200
commit62fb28eb6b2348661c070b894e6b550a7776b2fd (patch)
tree80f20115f2baf19fea85e6862492118d268bfcef
parent635d0482e80d8d70a90ad788303c020bd429b104 (diff)
v2.4.6
-rw-r--r--composer.json5
-rw-r--r--php-latte.spec16
2 files changed, 15 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 39219e9..156298c 100644
--- a/composer.json
+++ b/composer.json
@@ -20,12 +20,13 @@
"ext-tokenizer": "*"
},
"require-dev": {
- "nette/tester": "~2.0",
+ "nette/tester": "~1.7",
"tracy/tracy": "^2.3"
},
"suggest": {
"ext-mbstring": "to use filters like lower, upper, capitalize, ...",
- "ext-fileinfo": "to use filter |datastream"
+ "ext-fileinfo": "to use filter |datastream",
+ "nette/utils": "to use filter |webalize"
},
"conflict": {
"nette/application": "<2.4.1"
diff --git a/php-latte.spec b/php-latte.spec
index eceb182..0345c44 100644
--- a/php-latte.spec
+++ b/php-latte.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 8c14fa21390fd2c119924c88bb196dd705dc680f
+%global gh_commit 6d560edc49b052de6821acb48a1f438862d5b48b
#global gh_date 20150728
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner nette
@@ -16,7 +16,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_project}
-Version: 2.4.5
+Version: 2.4.6
%global specrel 1
Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Latte: the amazing template engine for PHP
@@ -43,7 +43,7 @@ BuildRequires: php-reflection
BuildRequires: php-spl
BuildRequires: php-xml
# From composer.json, "require-dev": {
-# "nette/tester": "~2.0",
+# "nette/tester": "~1.7",
# "tracy/tracy": "^2.3"
# ignore tester min version (pass with 1.7), ignore tracy (pass without)
BuildRequires: php-composer(%{gh_owner}/tester) >= 1.7
@@ -58,9 +58,13 @@ 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-fileinfo": "to use filter |datastream",
+# "nette/utils": "to use filter |webalize"
Requires: php-fileinfo
Requires: php-mbstring
+%if 0%{?fedora}
+Suggests: php-composer(%{gh_owner}/utils)
+%endif
# from composer.json, "conflict": {
# "nette/application": "<2.4"
Conflicts: php-composer(%{gh_owner}/application) < 2.4.1
@@ -142,6 +146,10 @@ exit $ret
%changelog
+* Wed Aug 30 2017 Remi Collet <remi@remirepo.net> - 2.4.6-1
+- Update to 2.4.6
+- add optional dependency on nette/utils
+
* Sat Aug 5 2017 Remi Collet <remi@remirepo.net> - 2.4.5-1
- Update to 2.4.5