From 264b1cd91c81744b1b344b7640675d84c07523d5 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 19 Jun 2015 13:49:59 +0200
Subject: php-pecl-xdebug: 2.3.3

---
 php-pecl-xdebug.spec | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'php-pecl-xdebug.spec')

diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec
index d6e46c6..4f86cbb 100644
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@ -19,7 +19,7 @@
 
 %global pecl_name   xdebug
 %global with_zts    0%{?__ztsphp:1}
-%global gh_commit   5c8c76b1d69a0395130fe9b23ad18f767a94e798
+%global gh_commit   2d2bdbc7948aa72143df0c5fc0eb684078732bf9
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global with_tests  %{?_with_tests:1}%{!?_with_tests:0}
 
@@ -32,21 +32,10 @@
 
 Name:           %{?scl_prefix}php-pecl-xdebug
 Summary:        PECL package for debugging PHP scripts
-Version:        2.3.2
-Release:        5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        2.3.3
+Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 
-# https://github.com/xdebug/xdebug/pull/172
-# https://bugzilla.redhat.com/1214111
-Patch0:         %{pecl_name}-pr172.patch
-# https://github.com/xdebug/xdebug/pull/176
-Patch1:         %{pecl_name}-pr176.patch
-# https://github.com/xdebug/xdebug/pull/167
-Patch2:         %{pecl_name}-pr167.patch
-# https://github.com/xdebug/xdebug/pull/178
-Patch3:         %{pecl_name}-pr178.patch
-
-
 # The Xdebug License, version 1.01
 # (Based on "The PHP License", version 3.0)
 License:        PHP
@@ -121,10 +110,6 @@ mv %{pecl_name}-%{gh_commit} NTS
 mv NTS/package.xml .
 
 cd NTS
-%patch2 -p1 -b .pr167
-%patch0 -p1 -b .pr172
-%patch1 -p1 -b .pr176
-%patch3 -p1 -b .pr178
 
 # Check extension version
 ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h)
@@ -297,6 +282,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 19 2015 Remi Collet <remi@fedoraproject.org> - 2.3.3-1
+- update to 2.3.3
+- drop all patches, merged upstream
+
 * Fri May 29 2015 Remi Collet <remi@fedoraproject.org> - 2.3.2-5
 - sources from github, with test suite
 - run test suite when build using "--with tests" option
-- 
cgit