[php-pecl-xdebug] upstream patch for upstream bug #838/#839/#840

[Remi Collet]

commit f846c3880b2175e14c928226306f76b0d5a75169
Author: remi <fedora at famillecollet.com>
Date:   Fri Jun 22 19:17:16 2012 +0200

    upstream patch for upstream bug #838/#839/#840

 .gitignore           |    3 +--
 php-pecl-xdebug.spec |    9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f0b45a..e75cfb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *~
-/xdebug-2.1.2.tgz
-/derickr-xdebug-XDEBUG_2_1_2-193-gd076740.tar.gz
+package*.xml
 /xdebug-2.2.0RC1.tgz
 /xdebug-2.2.0RC2.tgz
 /xdebug-2.2.0.tgz
diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec
index 5c0ad50..b7ba123 100644
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@ -6,9 +6,12 @@
 Name:           php-pecl-xdebug
 Summary:        PECL package for debugging PHP scripts
 Version:        2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
+# Fixed bug #838/bug #839/bug #840: Debugging static properties crashes Xdebug
+Patch0:         xdebug-git.patch
+
 # The Xdebug License, version 1.01
 # (Based on "The PHP License", version 3.0)
 License:        PHP
@@ -67,6 +70,7 @@ Xdebug also provides:
 %setup -qc
 
 cd %{pecl_name}-%{version}%{?prever}
+%patch0 -p1 -b .orig
 
 # https://bugs.php.net/60330
 sed -i -e '/AC_PREREQ/s/2.60/2.59/' debugclient/configure.in
@@ -198,6 +202,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 22 2012 Remi Collet <remi at fedoraproject.org> - 2.2.0-2
+- upstream patch for upstream bug #838/#839/#840
+
 * Wed May 09 2012 Remi Collet <remi at fedoraproject.org> - 2.2.0-1
 - Update to 2.2.0