From dde8b7edee885fa6bf5eafc373b144ea10ab905b Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 15 Jan 2014 09:55:42 +0100
Subject: php-pecl-rrd: 1.1.3 (stable) - no change, only our patch merged
 upstream

---
 php-pecl-rrd.spec | 16 ++++-------
 rrd-svn.patch     | 86 -------------------------------------------------------
 2 files changed, 5 insertions(+), 97 deletions(-)
 delete mode 100644 rrd-svn.patch

diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec
index 718672c..1747d83 100644
--- a/php-pecl-rrd.spec
+++ b/php-pecl-rrd.spec
@@ -17,19 +17,14 @@
 
 Summary:      PHP Bindings for rrdtool
 Name:         %{?scl_prefix}php-pecl-rrd
-Version:      1.1.2
-Release:      2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:      1.1.3
+Release:      1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:      BSD
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/rrd
 
 Source:       http://pecl.php.net/get/%{pecl_name}-%{version}%{?pre}.tgz
 
-# http://svn.php.net/viewvc?view=revision&revision=332619
-# http://svn.php.net/viewvc?view=revision&revision=332620
-# fix build with rrdtool < 1.4
-Patch0:       %{pecl_name}-svn.patch
-
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: %{?scl_prefix}php-devel >= 5.3.2
 BuildRequires: rrdtool
@@ -77,10 +72,6 @@ system for time series data.
 
 mv %{pecl_name}-%{version} NTS
 
-cd NTS
-%patch0 -p0 -b .svn
-cd ..
-
 cat > %{pecl_name}.ini << 'EOF'
 ; Enable %{pecl_name} extension module
 extension=%{pecl_name}.so
@@ -191,6 +182,9 @@ fi
 
 
 %changelog
+* Wed Jan 15 2014 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
+- Update to 1.1.3 (stable)
+
 * Tue Jan 14 2014 Remi Collet <remi@fedoraproject.org> - 1.1.2-2
 - fix upstream patch
 
diff --git a/rrd-svn.patch b/rrd-svn.patch
deleted file mode 100644
index 8e95bcf..0000000
--- a/rrd-svn.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: config.m4
-===================================================================
---- config.m4	(révision 332618)
-+++ config.m4	(copie de travail)
-@@ -67,6 +67,9 @@
-   dnl rrd_lastupdate_r available in 1.4.0+
-   PHP_CHECK_FUNC(rrd_lastupdate_r, rrd)
- 
-+  dnl rrd_disconnect available in 1.4.0+
-+  PHP_CHECK_FUNC(rrdc_disconnect, rrd)
-+
-   LDFLAGS=$old_LDFLAGS
- 
-   PHP_NEW_EXTENSION(rrd, rrd.c rrd_graph.c rrd_create.c rrd_update.c rrd_info.c, $ext_shared)
-Index: rrd.c
-===================================================================
---- rrd.c	(révision 332618)
-+++ rrd.c	(copie de travail)
-@@ -481,6 +481,7 @@
- }
- /* }}} */
- 
-+#ifdef HAVE_RRDC_DISCONNECT
- /* {{{ proto void rrdc_disconnect()
-  * Close any outstanding connection to rrd cache daemon.
-  */
-@@ -492,6 +493,7 @@
- 
- 	rrdc_disconnect();
- }
-+#endif
- 
- /* {{{ proto string rrd_version()
-  * Gets version of underlying librrd.
-@@ -573,7 +575,9 @@
- 	PHP_FE(rrd_restore, arginfo_rrd_restore)
- 	PHP_FE(rrd_tune, arginfo_rrd_tune)
- 	PHP_FE(rrd_xport, arginfo_rrd_xport)
-+#ifdef HAVE_RRDC_DISCONNECT
- 	PHP_FE(rrdc_disconnect, NULL)
-+#endif
- 	PHP_FE(rrd_version, NULL)
- 	{NULL, NULL, NULL}
- };
-@@ -609,7 +613,9 @@
- static PHP_MSHUTDOWN_FUNCTION(rrd)
- {
- 	/* ensure that any connection to rrd cache deamon will be closed */
-+#ifdef HAVE_RRDC_DISCONNECT
- 	rrdc_disconnect();
-+#endif
- 	return SUCCESS;
- }
- /* }}} */
-Index: tests/rrd_012.phpt
-===================================================================
---- tests/rrd_012.phpt	(révision 332618)
-+++ tests/rrd_012.phpt	(copie de travail)
-@@ -11,6 +11,8 @@
- --FILE--
- <?php
- include('data/definition.inc');
-+putenv('LANG=C');
-+setlocale(LC_ALL, 'C');
- var_dump($info = rrd_info($data_updatedDb));
- var_dump($info["filename"] == $data_updatedDb);
- ?>
-Index: tests/rrd_022.phpt
-===================================================================
---- tests/rrd_022.phpt	(révision 332618)
-+++ tests/rrd_022.phpt	(copie de travail)
-@@ -1,7 +1,13 @@
- --TEST--
- rrdc_disconnect test
- --SKIPIF--
--<?php include('skipif.inc'); ?>
-+<?php
-+include('skipif.inc');
-+if (!function_exists("rrdc_disconnect")) {
-+	die("skip rrdc_disconnect only in rrdtool >= 1.4");
-+}
-+
-+?>
- --FILE--
- <?php
- var_dump(rrdc_disconnect());
-- 
cgit