Fixed rrdtool-python to import the module properl
This commit is contained in:
parent
6d8e5ed20b
commit
8f5f96008d
30
rrdtool-1.2.15-initrrdtool.patch
Normal file
30
rrdtool-1.2.15-initrrdtool.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
--- rrdtool-1.2.15/bindings/python/rrdtoolmodule.c.initrrdtool 2006-07-14 08:11:26.000000000 -0400
|
||||||
|
+++ rrdtool-1.2.15/bindings/python/rrdtoolmodule.c 2006-08-01 15:21:49.000000000 -0400
|
||||||
|
@@ -48,8 +48,8 @@
|
||||||
|
extern int opterr;
|
||||||
|
|
||||||
|
/* forward declaration to keep compiler happy */
|
||||||
|
-/*void initrrdtool(void);*/
|
||||||
|
-void initrrdtoolmodule(void);
|
||||||
|
+void initrrdtool(void);
|
||||||
|
+/*void initrrdtoolmodule(void);*/
|
||||||
|
|
||||||
|
static int
|
||||||
|
create_args(char *command, PyObject *args, int *argc, char ***argv)
|
||||||
|
@@ -518,13 +518,13 @@
|
||||||
|
|
||||||
|
/* Initialization function for the module */
|
||||||
|
void
|
||||||
|
-/*initrrdtool(void)*/
|
||||||
|
-initrrdtoolmodule(void)
|
||||||
|
+initrrdtool(void)
|
||||||
|
+/*initrrdtoolmodule(void)*/
|
||||||
|
{
|
||||||
|
PyObject *m, *d, *t;
|
||||||
|
|
||||||
|
/* Create the module and add the functions */
|
||||||
|
- m = Py_InitModule("rrdtoolmodule", _rrdtool_methods);
|
||||||
|
+ m = Py_InitModule("rrdtool", _rrdtool_methods);
|
||||||
|
|
||||||
|
/* Add some symbolic constants to the module */
|
||||||
|
d = PyModule_GetDict(m);
|
10
rrdtool.spec
10
rrdtool.spec
@ -4,13 +4,14 @@
|
|||||||
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.2.15
|
Version: 1.2.15
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
|
URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
|
||||||
Source0: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/pub/%{name}-%{version}.tar.gz
|
Source0: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/pub/%{name}-%{version}.tar.gz
|
||||||
Source1: php4-svn%{php_rrd_svn}.tar.gz
|
Source1: php4-svn%{php_rrd_svn}.tar.gz
|
||||||
Patch0: rrdtool-1.2.13-php.patch
|
Patch0: rrdtool-1.2.13-php.patch
|
||||||
|
Patch1: rrdtool-1.2.15-initrrdtool.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: gcc-c++, openssl-devel
|
BuildRequires: gcc-c++, openssl-devel
|
||||||
BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
|
BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
|
||||||
@ -87,7 +88,8 @@ RRDtool bindings to the PHP HTML-embedded scripting language.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%setup -q -T -D -a 1
|
%setup -q -T -D -a 1
|
||||||
# Patch based on http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.tgz
|
# Patch based on http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.tgz
|
||||||
%patch -p0 -b .php
|
%patch0 -p0 -b .php
|
||||||
|
%patch1 -p1 -b .initrrdtool
|
||||||
|
|
||||||
# Fix to find correct python dir on lib64
|
# Fix to find correct python dir on lib64
|
||||||
%{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
|
%{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
|
||||||
@ -219,6 +221,10 @@ find examples/ -type f -exec chmod 0644 {} \;
|
|||||||
%{php_extdir}/rrdtool.so
|
%{php_extdir}/rrdtool.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 1 2006 Mihai Ibanescu <misa@redhat.com> 1.2.15-2
|
||||||
|
- Fixed rrdtool-python to import the module properly (patch
|
||||||
|
rrdtool-1.2.15-initrrdtool.patch)
|
||||||
|
|
||||||
* Mon Jul 17 2006 Jarod Wilson <jwilson@redhat.com> 1.2.15-1
|
* Mon Jul 17 2006 Jarod Wilson <jwilson@redhat.com> 1.2.15-1
|
||||||
- Update to 1.2.15
|
- Update to 1.2.15
|
||||||
- Minor spec cleanups
|
- Minor spec cleanups
|
||||||
|
Loading…
Reference in New Issue
Block a user