From 783f3fcfd09afbc8f80d63e523e4a0341f0bd44b Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 23 Sep 2013 16:35:22 +0200
Subject: php-bartlett-PHP-CompatInfo: 2.23.1

---
 PHP_CompatInfo-jsonc.patch       | 25 -------------------------
 php-bartlett-PHP-CompatInfo.spec | 15 +++++----------
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 PHP_CompatInfo-jsonc.patch

diff --git a/PHP_CompatInfo-jsonc.patch b/PHP_CompatInfo-jsonc.patch
deleted file mode 100644
index 9264342..0000000
--- a/PHP_CompatInfo-jsonc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b504dcdd1a4d1b976a9a63631237685ee886907a Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Fri, 20 Sep 2013 10:59:22 +0200
-Subject: [PATCH] new constant in Jsonc extension
-
----
- tests/Reference/JsonTest.php | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/Reference/JsonTest.php b/tests/Reference/JsonTest.php
-index ab6aeca..d6976b2 100644
---- a/tests/Reference/JsonTest.php
-+++ b/tests/Reference/JsonTest.php
-@@ -43,6 +43,8 @@ protected function setUp()
-     {
-         // New features of JSONC alternative extension
-         $this->ignoredconstants = array(
-+            'JSON_C_BUNDLED',
-+            'JSON_C_VERSION',
-             'JSON_PARSER_NOTSTRICT',
-         );
-         $this->ignoredclasses = array(
--- 
-1.8.4
-
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 3170247..713981f 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -15,7 +15,7 @@
 
 
 Name:           php-bartlett-PHP-CompatInfo
-Version:        2.23.0
+Version:        2.23.1
 Release:        1%{?dist}
 Summary:        Find out version and the extensions required for a piece of code to run
 
@@ -32,9 +32,6 @@ Source1:        https://raw.github.com/llaville/php-compat-info/master/misc/phpc
 # Add .install .module to fileExtensions (for drupal)
 Patch0:         %{pear_name}-conf.patch
 
-# https://github.com/llaville/php-compat-info/pull/101
-Patch1:         %{pear_name}-jsonc.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
@@ -86,12 +83,7 @@ cp phpcompatinfo.xml.dist phpcompatinfo.xml
 # Apply our changes
 %patch0  -p1 -b .rpm
 
-# Fix for jsonc extension
-%patch1 -p1 -b .jsonc
-
-# remove checksum for patched files
-sed -e '/JsonTest/s/md5sum=.*name/name/' \
-    ../package.xml >%{name}.xml
+cp ../package.xml %{name}.xml
 
 
 %build
@@ -176,6 +168,9 @@ fi
 
 
 %changelog
+* Mon Sep 23 2013 Remi Collet <remi@fedoraproject.org> - 2.23.1-1
+- Update to 2.23.1
+
 * Fri Sep 20 2013 Remi Collet <remi@fedoraproject.org> - 2.23.0-1
 - Update to 2.23.0
 - raise dependencies: PHP 5.3.0, PHP_Reflect 1.8.0 (and < 2)
-- 
cgit