php-nette: 2.4.0

2 files changed, 55 insertions, 45 deletions

diff --git a/composer-dev.json b/composer-dev.json
index 0365e46..3dea56a 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -16,29 +16,35 @@
 		}
 	],
 	"require": {
-		"nette/application": "~2.3.12",
-		"nette/bootstrap": "~2.3.4",
-		"nette/caching": "~2.3.5",
-		"nette/component-model": "~2.2.4",
-		"nette/database": "~2.3.8",
-		"nette/deprecated": "~2.3.2",
-		"nette/di": "~2.3.10",
-		"nette/finder": "~2.3.2",
-		"nette/forms": "~2.3.8",
-		"nette/http": "~2.3.6",
-		"nette/mail": "~2.3.5",
-		"nette/neon": "~2.3.4",
-		"nette/php-generator": "~2.3.5",
-		"nette/reflection": "~2.3.2",
-		"nette/robot-loader": "~2.3.1",
-		"nette/safe-stream": "~2.3.2",
-		"nette/security": "~2.3.1",
-		"nette/tokenizer": "~2.2.1",
-		"nette/utils": "~2.3.8",
-		"latte/latte": "~2.3.11",
-		"tracy/tracy": "~2.3.10"
+		"nette/application": "^2.4",
+		"nette/bootstrap": "^2.4",
+		"nette/caching": "^2.5",
+		"nette/component-model": "^2.3",
+		"nette/database": "^2.4",
+		"nette/deprecated": "^2.3",
+		"nette/di": "^2.4",
+		"nette/finder": "^2.4",
+		"nette/forms": "^2.4",
+		"nette/http": "^2.4",
+		"nette/mail": "^2.4",
+		"nette/neon": "^2.4",
+		"nette/php-generator": "^2.4",
+		"nette/reflection": "^2.4",
+		"nette/robot-loader": "^2.4",
+		"nette/safe-stream": "^2.3",
+		"nette/security": "^2.4",
+		"nette/tokenizer": "^2.2",
+		"nette/utils": "^2.4",
+		"latte/latte": "^2.4",
+		"tracy/tracy": "^2.4"
 	},
 	"autoload": {
 		"classmap": ["Nette/"]
+	},
+	"minimum-stability": "dev",
+	"extra": {
+		"branch-alias": {
+			"dev-master": "2.4-dev"
+		}
 	}
 }
diff --git a/php-nette-dev.spec b/php-nette-dev.spec
index 9608086..4370776 100644
--- a/php-nette-dev.spec
+++ b/php-nette-dev.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    79d539fee7e927e5774492b0774044a0456cd50b
+%global gh_commit    25381e4ec7902734e49924c1ffd07017830c5f31
 #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.3.10
+Version:        2.4.0
 %global specrel 1
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Nette Framework
@@ -76,27 +76,27 @@ BuildRequires:  php-composer(tracy/tracy)
 #               "nette/utils": "~2.3.8",
 #               "latte/latte": "~2.3.11",
 #               "tracy/tracy": "~2.3.10"
-Requires:       php-composer(%{gh_owner}/application)     >= 2.3.12
-Requires:       php-composer(%{gh_owner}/bootstrap)       >= 2.3.4
-Requires:       php-composer(%{gh_owner}/caching)         >= 2.3.5
-Requires:       php-composer(%{gh_owner}/component-model) >= 2.2.4
-Requires:       php-composer(%{gh_owner}/database)        >= 2.3.8
-Requires:       php-composer(%{gh_owner}/deprecated)      >= 2.3.2
-Requires:       php-composer(%{gh_owner}/di)              >= 2.3.10
-Requires:       php-composer(%{gh_owner}/finder)          >= 2.3.2
-Requires:       php-composer(%{gh_owner}/forms)           >= 2.3.8
-Requires:       php-composer(%{gh_owner}/http)            >= 2.3.6
-Requires:       php-composer(%{gh_owner}/mail)            >= 2.3.5
-Requires:       php-composer(%{gh_owner}/neon)            >= 2.3.4
-Requires:       php-composer(%{gh_owner}/php-generator)   >= 2.3.5
-Requires:       php-composer(%{gh_owner}/reflection)      >= 2.3.2
-Requires:       php-composer(%{gh_owner}/robot-loader)    >= 2.3.1
-Requires:       php-composer(%{gh_owner}/safe-stream)     >= 2.3.2
-Requires:       php-composer(%{gh_owner}/security)        >= 2.3.1
-Requires:       php-composer(%{gh_owner}/tokenizer)       >= 2.2.1
-Requires:       php-composer(%{gh_owner}/utils)           >= 2.3.8
-Requires:       php-composer(latte/latte)                 >= 2.3.11
-Requires:       php-composer(tracy/tracy)                 >= 2.3.10
+Requires:       php-composer(%{gh_owner}/application)     >= 2.4
+Requires:       php-composer(%{gh_owner}/bootstrap)       >= 2.4
+Requires:       php-composer(%{gh_owner}/caching)         >= 2.5
+Requires:       php-composer(%{gh_owner}/component-model) >= 2.3
+Requires:       php-composer(%{gh_owner}/database)        >= 2.4
+Requires:       php-composer(%{gh_owner}/deprecated)      >= 2.3
+Requires:       php-composer(%{gh_owner}/di)              >= 2.4
+Requires:       php-composer(%{gh_owner}/finder)          >= 2.4
+Requires:       php-composer(%{gh_owner}/forms)           >= 2.4
+Requires:       php-composer(%{gh_owner}/http)            >= 2.4
+Requires:       php-composer(%{gh_owner}/mail)            >= 2.4
+Requires:       php-composer(%{gh_owner}/neon)            >= 2.4
+Requires:       php-composer(%{gh_owner}/php-generator)   >= 2.4
+Requires:       php-composer(%{gh_owner}/reflection)      >= 2.4
+Requires:       php-composer(%{gh_owner}/robot-loader)    >= 2.4
+Requires:       php-composer(%{gh_owner}/safe-stream)     >= 2.3
+Requires:       php-composer(%{gh_owner}/security)        >= 2.4
+Requires:       php-composer(%{gh_owner}/tokenizer)       >= 2.2
+Requires:       php-composer(%{gh_owner}/utils)           >= 2.4
+Requires:       php-composer(latte/latte)                 >= 2.4
+Requires:       php-composer(tracy/tracy)                 >= 2.4
 # from phpcompatinfo report for version 2.3.7: nothing
 
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
@@ -161,7 +161,7 @@ cp -pr %{ns_vendor} %{buildroot}%{php_home}/%{ns_vendor}
 php -r '
 require "%{buildroot}%{php_home}/%{ns_vendor}/autoload.php";
 printf("%s version %s, %s\n", Nette\Framework::NAME, Nette\Framework::VERSION, Nette\Framework::REVISION);
-exit(version_compare(Nette\Framework::VERSION, "%{version}") ? 1 : 0);
+exit(version_compare(Nette\Framework::VERSION, "2.4") ? 1 : 0);
 '
 %else
 : Test suite disabled
@@ -182,6 +182,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug  4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
+- update to 2.4.0
+- raise minimal version of updated components
+
 * Thu Apr 14 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1
 - update to 2.3.10
 - raise minimal version of updated components