php-nette-caching: 2.5.1

2 files changed, 51 insertions, 27 deletions

diff --git a/composer-dev.json b/composer-dev.json
index a5ccf5a..906aa3f 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -14,14 +14,18 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.1",
+		"php": ">=5.6.0",
 		"nette/finder": "~2.2",
-		"nette/utils": "~2.2"
+		"nette/utils": "~2.4"
 	},
 	"require-dev": {
-		"nette/tester": "~1.6",
-		"nette/di": "~2.3",
-		"latte/latte": "~2.3.0"
+		"nette/tester": "~2.0",
+		"nette/di": "~2.4",
+		"latte/latte": "~2.4",
+		"tracy/tracy": "^2.4"
+	},
+	"suggest": {
+		"ext-pdo_sqlite": "to use SQLiteStorage or SQLiteJournal"
 	},
 	"conflict": {
 		"nette/nette": "<2.2"
@@ -32,7 +36,7 @@
 	"minimum-stability": "dev",
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.3-dev"
+			"dev-master": "2.5-dev"
 		}
 	}
 }
diff --git a/php-nette-caching-dev.spec b/php-nette-caching-dev.spec
index 8bc4811..b21bc0e 100644
--- a/php-nette-caching-dev.spec
+++ b/php-nette-caching-dev.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    0cb5c2c91e92a155ca5c1700479476b80c30dece
+%global gh_commit    da827a7f4704cf99abcba2973496d4f2c623b32f
 #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.3.5
+Version:        2.5.1
 %global specrel 1
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Nette Caching Component
@@ -33,36 +33,39 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-composer(theseer/autoload)
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.3.1
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-pdo
 BuildRequires:  php-date
 BuildRequires:  php-reflection
 BuildRequires:  php-composer(%{gh_owner}/finder) >= 2.2
-BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.2
+BuildRequires:  php-composer(%{gh_owner}/utils) >= 2.4
 # From composer.json, "require-dev": {
-#        "nette/tester": "~1.6"
-#        "nette/di": "~2.3",
-#        "latte/latte": "~2.3.0"
-BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.6
-BuildRequires:  php-composer(%{gh_owner}/di) >= 2.3
-BuildRequires:  php-composer(latte/latte) >= 2.3
+#               "nette/tester": "~2.0",
+#               "nette/di": "~2.4",
+#               "latte/latte": "~2.4",
+#               "tracy/tracy": "^2.4"
+BuildRequires:  php-composer(%{gh_owner}/tester) >= 2.0
+BuildRequires:  php-composer(%{gh_owner}/di) >= 2.4
+BuildRequires:  php-composer(latte/latte) >= 2.4
+BuildRequires:  php-composer(tracy/tracy) >= 2.4
 %endif
 
 # from composer.json, "require": {
-#        "php": ">=5.3.1"
-#        "nette/finder": "~2.2",
-#        "nette/utils": "~2.2"
-Requires:       php(language) >= 5.3.1
+#               "php": ">=5.6.0",
+#               "nette/finder": "~2.2",
+#               "nette/utils": "~2.4"
+Requires:       php(language) >= 5.6
 Requires:       php-composer(%{gh_owner}/finder) >= 2.2
 Requires:       php-composer(%{gh_owner}/finder) <  3
-Requires:       php-composer(%{gh_owner}/utils) >= 2.2
+Requires:       php-composer(%{gh_owner}/utils) >= 2.4
 Requires:       php-composer(%{gh_owner}/utils) <  3
 # from phpcompatinfo report for version 2.3.3
 Requires:       php-pdo
+Requires:       php-reflection
 Requires:       php-date
-Requires:       php-spl
 %if 0%{?fedora} > 21
 Suggests:       php-pecl(memcache)
+Suggests:       php-pecl(memcached)
 %endif
 
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
@@ -117,12 +120,24 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php';
 EOF
 
 : Run test suite in sources tree
+# remirepo:13
+ret=0
+run=0
+if which php56; then
+   cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini
+   php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s || ret=1
+   run=1
+fi
+if which php71; then
+   cat /etc/opt/remi/php71/php.ini /etc/opt/remi/php71/php.d/*ini >php.ini
+   php71 %{_bindir}/nette-tester --colors 0 -p php71 -c ./php.ini tests -s || ret=1
+   run=1
+fi
+if [ $run -eq 0 ]; then
 %{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s
-
-if which php70; then
-  cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini
-  php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s
+# remirepo:2
 fi
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -143,6 +158,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug  2 2016 Remi Collet <remi@fedoraproject.org> - 2.5.1-1
+- update to 2.5.1
+- raise dependency on PHP >= 5.6
+- raise dependency on nette/utils >= 2.4
+
 * Mon Feb 22 2016 Remi Collet <remi@fedoraproject.org> - 2.3.5-1
 - update to 2.3.5
 - run test suite with both PHP 7 and 7 when available
@@ -151,4 +171,4 @@ rm -rf %{buildroot}
 - update to 2.3.4
 
 * Tue Oct 20 2015 Remi Collet <remi@fedoraproject.org> - 2.3.3-1
-- initial package
\ No newline at end of file
+- initial package