php-pecl-rrd 1.1.0

4 files changed, 19 insertions, 137 deletions

diff --git a/Makefile b/Makefile
index 1e65467..13af741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 SRCDIR := $(shell pwd)
 NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../../common/Makefile
 
diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec
index 737b07b..cfcc9e9 100644
--- a/php-pecl-rrd.spec
+++ b/php-pecl-rrd.spec
@@ -5,8 +5,8 @@
 
 Summary:      PHP Bindings for rrdtool
 Name:         php-pecl-rrd
-Version:      1.0.5
-Release:      2%{?dist}
+Version:      1.1.0
+Release:      1%{?dist}
 License:      BSD
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/rrd
@@ -21,11 +21,13 @@ BuildRequires: php-pear
 
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
-Conflicts:    rrdtool-php
-Provides:     php-pecl(%{pecl_name}) = %{version}%{?pre}
 Requires:     php(zend-abi) = %{php_zend_api}
 Requires:     php(api) = %{php_core_api}
 
+Conflicts:    rrdtool-php
+Provides:     php-pecl(%{pecl_name}) = %{version}%{?pre}
+Provides:     php-pecl(%{pecl_name})%{?_isa} = %{version}%{?pre}
+
 
 # RPM 4.8
 %{?filter_provides_in: %filter_provides_in %{_dir}/.*\.so$}
@@ -103,11 +105,13 @@ if  grep -q "FAILED TEST" rpmtests.log; then
      echo "*** FAILED: $(basename $t .diff)"
      diff -u tests/$(basename $t .diff).exp tests/$(basename $t .diff).out || :
   done
-%if 0%{?fedora} >= 14
-  # tests only succeed with rrdtool 1.4.x
+
+  # tests only succeed with some rrdtool version (> 1.4.0 but < 1.4.7)
+  # because of difference between image size / position
   # http://pecl.php.net/bugs/22642
-  exit 1
-%endif
+
+  # only consider result of rrd_version test
+  [ -f tests/rrd_020.diff ] && exit 1
 fi
 
 
@@ -136,6 +140,12 @@ fi
 
 
 %changelog
+* Sun Aug 12 2012 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
+- Version 1.1.0 (stable), api 1.1.0 (stable)
+
+* Tue Jul 31 2012 Remi Collet <remi@fedoraproject.org> - 1.0.5-4
+- ignore test results (fails with rrdtool 1.4.7)
+
 * Fri Nov 18 2011 Remi Collet <Fedora@FamilleCollet.com> 1.0.5-2
 - build against php 5.4
 
diff --git a/rrd-zts.patch b/rrd-zts.patch
deleted file mode 100644
index 89e136e..0000000
--- a/rrd-zts.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -up rrd-1.0.5-zts/config.h.zts rrd-1.0.5-zts/config.h
-diff -up rrd-1.0.5-zts/php_rrd.h.zts rrd-1.0.5-zts/php_rrd.h
-diff -up rrd-1.0.5-zts/rrd_create.c.zts rrd-1.0.5-zts/rrd_create.c
---- rrd-1.0.5-zts/rrd_create.c.zts	2011-10-05 16:55:01.879360846 +0200
-+++ rrd-1.0.5-zts/rrd_create.c	2011-10-05 16:57:33.400886856 +0200
-@@ -359,7 +359,7 @@ static zend_function_entry rrd_create_me
- };
- 
- /* minit hook, called from main module minit */
--void rrd_create_minit(TSRMLS_DC)
-+void rrd_create_minit(TSRMLS_D)
- {
- 	zend_class_entry ce;
- 	INIT_CLASS_ENTRY(ce, "RRDCreator", rrd_create_methods);
-diff -up rrd-1.0.5-zts/rrd_create.h.zts rrd-1.0.5-zts/rrd_create.h
---- rrd-1.0.5-zts/rrd_create.h.zts	2011-10-05 16:55:01.890360872 +0200
-+++ rrd-1.0.5-zts/rrd_create.h	2011-10-05 16:55:39.430491085 +0200
-@@ -19,7 +19,7 @@
- #ifndef RRD_CREATE_H
- #define RRD_CREATE_H
- 
--void rrd_create_minit(TSRMLS_DC);
-+void rrd_create_minit(TSRMLS_D);
- PHP_FUNCTION(rrd_create);
- 
- #endif  /* RRD_CREATE_H */
-diff -up rrd-1.0.5-zts/rrd.c.zts rrd-1.0.5-zts/rrd.c
---- rrd-1.0.5-zts/rrd.c.zts	2011-10-05 16:55:01.876360794 +0200
-+++ rrd-1.0.5-zts/rrd.c	2011-10-05 16:56:02.510571180 +0200
-@@ -585,9 +585,9 @@ static zend_function_entry rrd_functions
- /* {{{ PHP_MINIT_FUNCTION */
- static PHP_MINIT_FUNCTION(rrd)
- {
--	rrd_graph_minit(TSRMLS_CC);
--	rrd_create_minit(TSRMLS_CC);
--	rrd_update_minit(TSRMLS_CC);
-+	rrd_graph_minit(TSRMLS_C);
-+	rrd_create_minit(TSRMLS_C);
-+	rrd_update_minit(TSRMLS_C);
- 	return SUCCESS;
- }
- /* }}} */
-diff -up rrd-1.0.5-zts/rrd_graph.c.zts rrd-1.0.5-zts/rrd_graph.c
---- rrd-1.0.5-zts/rrd_graph.c.zts	2011-10-05 16:55:01.881360851 +0200
-+++ rrd-1.0.5-zts/rrd_graph.c	2011-10-05 16:57:10.217806300 +0200
-@@ -319,7 +319,7 @@ PHP_METHOD(RRDGraph, saveVerbose)
- 
- 	/* making return array */
- 	array_init(return_value);
--	rrd_info_toarray(rrd_info_data, return_value);
-+	rrd_info_toarray(rrd_info_data, return_value TSRMLS_CC);
- 
- 	rrd_info_free(rrd_info_data);
- 	rrd_args_free(graph_argv);
-@@ -413,7 +413,7 @@ static zend_function_entry rrd_graph_met
- };
- 
- /* minit hook, called from main module minit */
--void rrd_graph_minit(TSRMLS_DC)
-+void rrd_graph_minit(TSRMLS_D)
- {
- 	zend_class_entry ce;
- 	INIT_CLASS_ENTRY(ce, "RRDGraph", rrd_graph_methods);
-diff -up rrd-1.0.5-zts/rrd_graph.h.zts rrd-1.0.5-zts/rrd_graph.h
---- rrd-1.0.5-zts/rrd_graph.h.zts	2011-10-05 16:55:01.892360879 +0200
-+++ rrd-1.0.5-zts/rrd_graph.h	2011-10-05 16:55:20.609425792 +0200
-@@ -19,7 +19,7 @@
- #ifndef RRD_GRAPH_H
- #define RRD_GRAPH_H
- 
--extern void rrd_graph_minit(TSRMLS_DC);
-+extern void rrd_graph_minit(TSRMLS_D);
- extern PHP_FUNCTION(rrd_graph);
- 
- #endif  /* RRD_GRAPH_H */
-diff -up rrd-1.0.5-zts/rrd_info.c.zts rrd-1.0.5-zts/rrd_info.c
---- rrd-1.0.5-zts/rrd_info.c.zts	2011-10-05 16:55:01.882360849 +0200
-+++ rrd-1.0.5-zts/rrd_info.c	2011-10-05 16:58:30.590085673 +0200
-@@ -60,7 +60,7 @@ PHP_FUNCTION(rrd_info)
- 
- 	/* making return array*/
- 	array_init(return_value);
--	rrd_info_toarray(rrd_info_data, return_value);
-+	rrd_info_toarray(rrd_info_data, return_value TSRMLS_CC);
- 	rrd_info_free(rrd_info_data);
- }
- /* }}} */
-@@ -99,4 +99,4 @@ uint rrd_info_toarray(const rrd_info_t *
- 
- 	return 1;
- }
--/* }}} */
-\ Pas de fin de ligne à la fin du fichier.
-+/* }}} */
-diff -up rrd-1.0.5-zts/rrd_info.h.zts rrd-1.0.5-zts/rrd_info.h
-diff -up rrd-1.0.5-zts/rrd_update.c.zts rrd-1.0.5-zts/rrd_update.c
---- rrd-1.0.5-zts/rrd_update.c.zts	2011-10-05 16:55:01.884360848 +0200
-+++ rrd-1.0.5-zts/rrd_update.c	2011-10-05 16:57:52.776954202 +0200
-@@ -290,7 +290,7 @@ static zend_function_entry rrd_update_me
- };
- 
- /* minit hook, called from main module minit */
--void rrd_update_minit(TSRMLS_DC)
-+void rrd_update_minit(TSRMLS_D)
- {
- 	zend_class_entry ce;
- 	INIT_CLASS_ENTRY(ce, "RRDUpdater", rrd_update_methods);
-diff -up rrd-1.0.5-zts/rrd_update.h.zts rrd-1.0.5-zts/rrd_update.h
---- rrd-1.0.5-zts/rrd_update.h.zts	2011-10-05 16:55:01.896360893 +0200
-+++ rrd-1.0.5-zts/rrd_update.h	2011-10-05 16:55:42.005500019 +0200
-@@ -19,7 +19,7 @@
- #ifndef RRD_UPDATE_H
- #define RRD_UPDATE_H
- 
--void rrd_update_minit(TSRMLS_DC);
-+void rrd_update_minit(TSRMLS_D);
- PHP_FUNCTION(rrd_update);
- 
- #endif  /* RRD_UPDATE_H */
diff --git a/rrdtool-php.lst b/rrdtool-php.lst
deleted file mode 100644
index 454d697..0000000
--- a/rrdtool-php.lst
+++ /dev/null
@@ -1,9 +0,0 @@
-            [2474] => rrd_graph
-            [2475] => rrd_fetch
-            [2476] => rrd_error
-            [2477] => rrd_clear_error
-            [2478] => rrd_update
-            [2479] => rrd_last
-            [2480] => rrd_create
-            [2481] => rrdtool_info
-            [2482] => rrdtool_logo_guid