summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-02-26 18:23:05 +0100
committerRemi Collet <fedora@famillecollet.com>2017-02-26 18:23:05 +0100
commit8f2d6b8f1d6baa9c22868cba06b68d6af9003167 (patch)
tree31b520a4483f57feb8a0ae30c5a1af268e6853cb
parenta050b58df7c3bfe3c9756325522f708f224568fe (diff)
php-nette-php-generator: 2.6.0
-rw-r--r--composer-dev.json6
-rw-r--r--php-nette-php-generator-dev.spec17
2 files changed, 13 insertions, 10 deletions
diff --git a/composer-dev.json b/composer-dev.json
index 005dd26..939aea9 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -15,10 +15,10 @@
],
"require": {
"php": ">=5.6.0",
- "nette/utils": "~2.4"
+ "nette/utils": "^2.4.2 || ~3.0.0"
},
"require-dev": {
- "nette/tester": "~2.0",
+ "nette/tester": "^2.0",
"tracy/tracy": "^2.3"
},
"conflict": {
@@ -30,7 +30,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
}
}
diff --git a/php-nette-php-generator-dev.spec b/php-nette-php-generator-dev.spec
index 16a3115..cfa1a0f 100644
--- a/php-nette-php-generator-dev.spec
+++ b/php-nette-php-generator-dev.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 3f317dc211953cc93e9efa61598dc074adc3b0de
+%global gh_commit eff05975fee1645471d4371b7a0a7acb62a25b15
#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.5.0
+Version: 2.6.0
%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Nette PHP Generator
@@ -36,9 +36,9 @@ BuildRequires: php-composer(theseer/autoload)
BuildRequires: php(language) >= 5.6
BuildRequires: php-pcre
BuildRequires: php-reflection
-BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4
+BuildRequires: php-composer(%{gh_owner}/utils) >= 2.4.2
# From composer.json, "require-dev": {
-# "nette/tester": "~2.0",
+# "nette/tester": "^2.0",
# "tracy/tracy": "^2.3"
# ignore tracy (pass without)
BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0
@@ -46,10 +46,10 @@ BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0
# from composer.json, "require": {
# "php": ">=5.6.0",
-# "nette/utils": "~2.4"
+# "nette/utils": "^2.4.2 || ~3.0.0"
Requires: php(language) >= 5.6
-Requires: php-composer(%{gh_owner}/utils) >= 2.4
-Requires: php-composer(%{gh_owner}/utils) < 3
+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
@@ -132,6 +132,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Feb 26 2017 Remi Collet <remi@fedoraproject.org> - 2.6.0-1
+- update to 2.6.0
+
* Sun Jan 15 2017 Remi Collet <remi@fedoraproject.org> - 2.5.0-1
- update to 2.5.0