rpms/rrdtool/devel rrdtool-1.0.49-fc4.patch, NONE, 1.1 rrdtool.spec, 1.9, 1.10

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5248

Modified Files:
	rrdtool.spec 
Added Files:
	rrdtool-1.0.49-fc4.patch 
Log Message:
FC4 build fix from Michael (#156242).


rrdtool-1.0.49-fc4.patch:

--- NEW FILE rrdtool-1.0.49-fc4.patch ---
diff -Nur rrdtool-1.0.49-orig/src/rrd_tool.h rrdtool-1.0.49/src/rrd_tool.h
--- rrdtool-1.0.49-orig/src/rrd_tool.h	2004-08-08 12:58:15.000000000 +0200
+++ rrdtool-1.0.49/src/rrd_tool.h	2005-05-20 14:40:13.000000000 +0200
@@ -21,7 +21,7 @@
 # include "ntconfig.h"
 #else
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "../config.h"
 #include "config_aux.h"
 #endif
 #endif


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rrdtool.spec	20 May 2005 11:22:32 -0000	1.9
+++ rrdtool.spec	20 May 2005 15:49:47 -0000	1.10
@@ -3,12 +3,13 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.0.49
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-%{version}.tar.gz
-Patch: rrdtool-1.0.49-php_config.patch
+Patch0: rrdtool-1.0.49-php_config.patch
+Patch1: rrdtool-1.0.49-fc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
 BuildRequires: libpng-devel, zlib-devel
@@ -46,7 +47,8 @@
 
 %prep
 %setup
-%patch -b .phpfix
+%patch0 -p0 -b .phpfix
+%patch1 -p1 -b .fc4
 
 # Fixes to /usr/lib(64) for x86_64
 %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
@@ -147,6 +149,9 @@
 
 
 %changelog
+* Fri May 20 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-5
+- Include patch from Michael to fix perl module compilation on FC4 (#156242).
+
 * Fri May 20 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-4
 - Fix for the php module patch (Joe Pruett, Dag Wieers), #156716.
 - Update source URL to new location since 1.2 is now the default stable.