summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-tracy-upstream.patch22
-rw-r--r--php-tracy.spec14
2 files changed, 6 insertions, 30 deletions
diff --git a/php-tracy-upstream.patch b/php-tracy-upstream.patch
deleted file mode 100644
index cf9fe7e..0000000
--- a/php-tracy-upstream.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 854be70433bfff9b61d45216abd38c512ab16471 Mon Sep 17 00:00:00 2001
-From: David Grudl <david@grudl.com>
-Date: Mon, 8 Feb 2016 01:05:25 +0100
-Subject: [PATCH] tests: fixed for PHP 7.0.3
-
----
- tests/Tracy/Dumper.toText().phpt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Tracy/Dumper.toText().phpt b/tests/Tracy/Dumper.toText().phpt
-index a3f6331..ef21093 100644
---- a/tests/Tracy/Dumper.toText().phpt
-+++ b/tests/Tracy/Dumper.toText().phpt
-@@ -58,7 +58,7 @@ Assert::match('array (5)
- | 7 => 7
- ', Dumper::toText(array(1, 'hello', array(), array(1, 2), array(1 => 1, 2, 3, 4, 5, 6, 7))));
-
--Assert::match("stream resource #%d%\n wrapper_type%A%", Dumper::toText(fopen(__FILE__, 'r')));
-+Assert::match("stream resource #%d%\n %S%%A%", Dumper::toText(fopen(__FILE__, 'r')));
-
- Assert::match('stdClass #%a%', Dumper::toText(new stdClass));
-
diff --git a/php-tracy.spec b/php-tracy.spec
index f1771ec..33ad72f 100644
--- a/php-tracy.spec
+++ b/php-tracy.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 9aa0ade4444def3178aa808255ea326b9e3da9f2
+%global gh_commit 3db887daa2a7a120189da73e9cf8ff415adfd70e
#global gh_date 20150728
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner nette
@@ -16,8 +16,8 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_project}
-Version: 2.3.8
-%global specrel 2
+Version: 2.3.9
+%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Tracy: useful PHP debugger
@@ -28,9 +28,6 @@ Source0: %{name}-%{version}-%{gh_short}.tgz
# pull a git snapshot to get test sutie
Source1: makesrc.sh
-# Fix test for new PHP
-Patch1: %{name}-upstream.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-composer(theseer/autoload)
@@ -85,8 +82,6 @@ To use this library, you just have to add, in your project:
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-%patch1 -p1 -b .upstream
-
# drop upstream autoloader which is outside tree
rm src/tracy.php
# move
@@ -150,6 +145,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Feb 22 2016 Remi Collet <remi@fedoraproject.org> - 2.3.9-1
+- update to 2.3.9
+
* Sun Feb 14 2016 Remi Collet <remi@fedoraproject.org> - 2.3.8-2
- add upstream patch for new PHP