diff options
| -rw-r--r-- | composer-dev.json | 8 | ||||
| -rw-r--r-- | php-nette-di-dev.spec | 21 |
2 files changed, 16 insertions, 13 deletions
diff --git a/composer-dev.json b/composer-dev.json index 5c9388a..5bfa287 100644 --- a/composer-dev.json +++ b/composer-dev.json @@ -16,12 +16,12 @@ "require": { "php": ">=5.6.0", "ext-tokenizer": "*", - "nette/neon": "^2.3.3", - "nette/php-generator": "^2.5", - "nette/utils": "^2.4.3" + "nette/neon": "^2.3.3 || ~3.0.0", + "nette/php-generator": "^2.5 || ~3.0.0", + "nette/utils": "^2.4.3 || ~3.0.0" }, "require-dev": { - "nette/tester": "~2.0", + "nette/tester": "^2.0", "tracy/tracy": "^2.3" }, "conflict": { diff --git a/php-nette-di-dev.spec b/php-nette-di-dev.spec index 4c4d11c..e14d602 100644 --- a/php-nette-di-dev.spec +++ b/php-nette-di-dev.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 28767a0abef69faa08bfa700e2e3f80ac58ab58e +%global gh_commit f2e8ced089549eda2288c780893bf4b4065449ee #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.4.6 +Version: 2.4.7 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette Dependency Injection Component @@ -42,7 +42,7 @@ BuildRequires: php-composer(%{gh_owner}/neon) >= 2.3.3 BuildRequires: php-composer(%{gh_owner}/php-generator) >= 2.5 BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4.3 # From composer.json, "require-dev": { -# "nette/tester": "~2.0", +# "nette/tester": "^2.0", # "tracy/tracy": "^2.3" BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 %endif @@ -50,17 +50,17 @@ BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0 # from composer.json, "require": { # "php": ">=5.6.0", # "ext-tokenizer": "*", -# "nette/neon": "^2.3.3", -# "nette/php-generator": "^2.5", -# "nette/utils": "^2.4.3" +# "nette/neon": "^2.3.3 || ~3.0.0", +# "nette/php-generator": "^2.5 || ~3.0.0", +# "nette/utils": "^2.4.3 || ~3.0.0" Requires: php(language) >= 5.6 Requires: php-tokenizer Requires: php-composer(%{gh_owner}/neon) >= 2.3.3 -Requires: php-composer(%{gh_owner}/neon) < 3 +Requires: php-composer(%{gh_owner}/neon) < 4 Requires: php-composer(%{gh_owner}/php-generator) >= 2.5 -Requires: php-composer(%{gh_owner}/php-generator) < 3 +Requires: php-composer(%{gh_owner}/php-generator) < 4 Requires: php-composer(%{gh_owner}/utils) >= 2.4.3 -Requires: php-composer(%{gh_owner}/utils) < 3 +Requires: php-composer(%{gh_owner}/utils) < 4 # from composer.json, "conflict": { Conflicts: php-composer(%{gh_owner}/bootstrap) < 2.4 # from phpcompatinfo report for version 2.4.6 @@ -158,6 +158,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 20 2017 Remi Collet <remi@fedoraproject.org> - 2.4.7-1 +- update to 2.4.7 + * Sun Jan 15 2017 Remi Collet <remi@fedoraproject.org> - 2.4.6-1 - update to 2.4.6 - raise dependency on nette/php-generator 2.5 |