rebuild for http://fedoraproject.org/wiki/Features/Php55
This commit is contained in:
Remi Collet
parent
73816984fb
commit
fb2446c7c5
83
rrdtool-1.4.7-php55.patch
Normal file
83
rrdtool-1.4.7-php55.patch
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
--- rrdtool-1.4.7/php4/rrdtool.c.orig 2013-03-22 14:54:18.520877577 +0100
|
||||||
|
+++ rrdtool-1.4.7/php4/rrdtool.c 2013-03-22 14:59:23.056303502 +0100
|
||||||
|
@@ -20,13 +20,11 @@
|
||||||
|
|
||||||
|
/* PHP Includes */
|
||||||
|
#include "php.h"
|
||||||
|
-#include "php_logos.h"
|
||||||
|
#include "ext/standard/info.h"
|
||||||
|
#include "SAPI.h"
|
||||||
|
|
||||||
|
/* rrdtool includes */
|
||||||
|
#include "php_rrdtool.h"
|
||||||
|
-#include "rrdtool_logo.h"
|
||||||
|
#include <rrd.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@@ -48,7 +46,6 @@
|
||||||
|
PHP_FE(rrd_last, NULL)
|
||||||
|
PHP_FE(rrd_create, NULL)
|
||||||
|
PHP_FE(rrdtool_info, NULL)
|
||||||
|
- PHP_FE(rrdtool_logo_guid, NULL)
|
||||||
|
{NULL, NULL, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -83,8 +80,6 @@
|
||||||
|
/* {{{ PHP_MINIT_FUNCTION */
|
||||||
|
PHP_MINIT_FUNCTION(rrdtool)
|
||||||
|
{
|
||||||
|
- php_register_info_logo(RRDTOOL_LOGO_GUID , "image/gif", rrdtool_logo , sizeof(rrdtool_logo));
|
||||||
|
-
|
||||||
|
return SUCCESS;
|
||||||
|
}
|
||||||
|
/* }}} */
|
||||||
|
@@ -92,8 +87,6 @@
|
||||||
|
/* {{{ PHP_MSHUTDOWN_FUNCTION */
|
||||||
|
PHP_MSHUTDOWN_FUNCTION(rrdtool)
|
||||||
|
{
|
||||||
|
- php_unregister_info_logo(RRDTOOL_LOGO_GUID);
|
||||||
|
-
|
||||||
|
return SUCCESS;
|
||||||
|
}
|
||||||
|
/* }}} */
|
||||||
|
@@ -102,11 +95,6 @@
|
||||||
|
PHP_MINFO_FUNCTION(rrdtool)
|
||||||
|
{
|
||||||
|
php_info_print_box_start(1);
|
||||||
|
- PUTS("<a href=\"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/\" target=\"rrdtool\"><img border=\"0\" src=\"");
|
||||||
|
- if (SG(request_info).request_uri) {
|
||||||
|
- PUTS(SG(request_info).request_uri);
|
||||||
|
- }
|
||||||
|
- PUTS("?="RRDTOOL_LOGO_GUID"\" alt=\"ClamAV logo\" /></a>\n");
|
||||||
|
php_printf("<h1 class=\"p\">rrdtool Version %s</h1>\n", PHP_RRD_VERSION_STRING);
|
||||||
|
php_info_print_box_end();
|
||||||
|
php_info_print_table_start();
|
||||||
|
@@ -548,11 +536,6 @@
|
||||||
|
PUTS("<body><div class=\"center\">\n");
|
||||||
|
|
||||||
|
php_info_print_box_start(1);
|
||||||
|
- PUTS("<a href=\"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/\" target=\"rrdtool\"><img border=\"0\" src=\"");
|
||||||
|
- if (SG(request_info).request_uri) {
|
||||||
|
- PUTS(SG(request_info).request_uri);
|
||||||
|
- }
|
||||||
|
- PUTS("?="RRDTOOL_LOGO_GUID"\" alt=\"ClamAV logo\" /></a>\n");
|
||||||
|
php_printf("<h1 class=\"p\">rrdtool Version %s</h1>\n", PHP_RRD_VERSION_STRING);
|
||||||
|
php_info_print_box_end();
|
||||||
|
php_info_print_table_start();
|
||||||
|
@@ -590,16 +573,6 @@
|
||||||
|
}
|
||||||
|
/* }}} */
|
||||||
|
|
||||||
|
-PHP_FUNCTION(rrdtool_logo_guid)
|
||||||
|
-{
|
||||||
|
- if (ZEND_NUM_ARGS() != 0) {
|
||||||
|
- WRONG_PARAM_COUNT;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- RETURN_STRINGL(RRDTOOL_LOGO_GUID, sizeof(RRDTOOL_LOGO_GUID)-1, 1);
|
||||||
|
-}
|
||||||
|
-/* }}} */
|
||||||
|
-
|
||||||
|
#endif /* HAVE_RRDTOOL */
|
||||||
|
|
||||||
|
/*
|
||||||
@ -18,7 +18,7 @@
|
|||||||
Summary: Round Robin Database Tool to store and display time-series data
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.4.7
|
Version: 1.4.7
|
||||||
Release: 11%{?dist}
|
Release: 12%{?dist}
|
||||||
License: GPLv2+ with exceptions
|
License: GPLv2+ with exceptions
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://oss.oetiker.ch/rrdtool/
|
URL: http://oss.oetiker.ch/rrdtool/
|
||||||
@ -27,6 +27,8 @@ Source1: php4-%{svnrev}.tar.gz
|
|||||||
Patch1: rrdtool-1.4.4-php54.patch
|
Patch1: rrdtool-1.4.4-php54.patch
|
||||||
# workaround for rhbz#92165
|
# workaround for rhbz#92165
|
||||||
Patch2: rrdtool-1.4.7-ruby-2-fix.patch
|
Patch2: rrdtool-1.4.7-ruby-2-fix.patch
|
||||||
|
# disable logo for php 5.5.
|
||||||
|
Patch3: rrdtool-1.4.7-php55.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Requires: dejavu-sans-mono-fonts, dejavu-lgc-sans-mono-fonts
|
Requires: dejavu-sans-mono-fonts, dejavu-lgc-sans-mono-fonts
|
||||||
@ -164,6 +166,7 @@ The %{name}-lua package includes RRDtool bindings for Lua.
|
|||||||
%setup -q -n %{name}-%{version} %{?with_php: -a 1}
|
%setup -q -n %{name}-%{version} %{?with_php: -a 1}
|
||||||
%if %{with_php}
|
%if %{with_php}
|
||||||
%patch1 -p1 -b .php54
|
%patch1 -p1 -b .php54
|
||||||
|
%patch3 -p1 -b .php55
|
||||||
%endif
|
%endif
|
||||||
%patch2 -p1 -b .ruby-2-fix
|
%patch2 -p1 -b .ruby-2-fix
|
||||||
|
|
||||||
@ -376,6 +379,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 22 2013 Remi Collet <rcollet@redhat.com> - 1.4.7-12
|
||||||
|
- rebuild for http://fedoraproject.org/wiki/Features/Php55
|
||||||
|
- remove rrdtool_logo_guid function
|
||||||
|
|
||||||
* Tue Mar 19 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-11
|
* Tue Mar 19 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-11
|
||||||
- Dropped ruby(abi) explicit requirement
|
- Dropped ruby(abi) explicit requirement
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user