summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer-dev.json4
-rw-r--r--php-nette-http-dev.spec19
-rw-r--r--php-nette-http-upstream.patch20
3 files changed, 11 insertions, 32 deletions
diff --git a/composer-dev.json b/composer-dev.json
index 2930964..bd2dc46 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -18,9 +18,9 @@
"nette/utils": "^2.4"
},
"require-dev": {
- "nette/di": "^2.3",
+ "nette/di": "^2.4",
"nette/tester": "~2.0",
- "tracy/tracy": "^2.3"
+ "tracy/tracy": "^2.4"
},
"conflict": {
"nette/nette": "<2.2"
diff --git a/php-nette-http-dev.spec b/php-nette-http-dev.spec
index 2f5e7cc..fa4429b 100644
--- a/php-nette-http-dev.spec
+++ b/php-nette-http-dev.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 659e277017006edf12d4fc86bf54a060e56c71ac
+%global gh_commit 313a0b7a1a702af1652ff5cc279741ff1228a15f
#global gh_date 20150728
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner nette
@@ -17,13 +17,11 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.4.0
+Version: 2.4.1
%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Nette HTTP Component
-Patch0: %{name}-upstream.patch
-
Group: Development/Libraries
License: BSD or GPLv2 or GPLv3
URL: https://github.com/%{gh_owner}/%{gh_project}
@@ -45,12 +43,12 @@ BuildRequires: php-pcre
BuildRequires: php-session
BuildRequires: php-spl
# From composer.json, "require-dev": {
-# "nette/di": "^2.3",
+# "nette/di": "^2.4",
# "nette/tester": "~2.0",
-# "tracy/tracy": "^2.3"
-BuildRequires: php-composer(%{gh_owner}/di) >= 2.3
+# "tracy/tracy": "^2.4"
+BuildRequires: php-composer(%{gh_owner}/di) >= 2.4
BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0
-BuildRequires: php-composer(tracy/tracy) >= 2.3
+BuildRequires: php-composer(tracy/tracy) >= 2.4
%endif
# from composer.json, "require": {
@@ -85,8 +83,6 @@ To use this library, you just have to add, in your project:
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
-
%build
: Generate a classmap autoloader
@@ -159,6 +155,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Sep 27 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
+- update to 2.4.1
+
* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
- update to 2.4.0
- raise dependency on PHP >= 5.6
diff --git a/php-nette-http-upstream.patch b/php-nette-http-upstream.patch
deleted file mode 100644
index 8ecdfac..0000000
--- a/php-nette-http-upstream.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 3fb64f5ae5d1e161cb8ab12de1fb9958cea8a50b Mon Sep 17 00:00:00 2001
-From: David Grudl <david@grudl.com>
-Date: Thu, 14 Jul 2016 16:56:39 +0200
-Subject: [PATCH] travis: added PHP 7.1
-
----
- .travis.yml | 4 ++++
- tests/Http/Session.start.error.phpt | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Http/Session.start.error.phpt b/tests/Http/Session.start.error.phpt
-index 9bf7e87..ebd213f 100644
---- a/tests/Http/Session.start.error.phpt
-+++ b/tests/Http/Session.start.error.phpt
-@@ -20,4 +20,4 @@ $session = new Session(new Nette\Http\Request(new Nette\Http\UrlScript), new Net
-
- Assert::exception(function () use ($session) {
- $session->start();
--}, Nette\InvalidStateException::class, '%a?%open(%A%) failed: %a%');
-+}, Nette\InvalidStateException::class);