rpms/rrdtool/FC-5 rrdtool.spec,1.21,1.22

["Jarod Wilson" (jwilson) <fedora-extras-commits redhat com>]

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23566/FC-5

Modified Files:
	rrdtool.spec 
Log Message:
Bring over rrdtool-python module fix from devel


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rrdtool.spec	17 Jul 2006 13:58:24 -0000	1.21
+++ rrdtool.spec	1 Aug 2006 19:48:50 -0000	1.22
@@ -4,13 +4,14 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
 Source0: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/pub/%{name}-%{version}.tar.gz
 Source1: php4-svn%{php_rrd_svn}.tar.gz
 Patch0: rrdtool-1.2.13-php.patch
+Patch1: rrdtool-1.2.15-initrrdtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-c++, openssl-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
@@ -87,7 +88,8 @@
 %setup -q
 %setup -q -T -D -a 1
 # 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
 %{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
@@ -219,6 +221,10 @@
 %{php_extdir}/rrdtool.so
 
 %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
 - Update to 1.2.15
 - Minor spec cleanups