From 51c582c35c56e29b351e3bf36a81edb11934ea76 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Fri, 20 May 2005 15:49:47 +0000 Subject: [PATCH] FC4 build fix from Michael (#156242). --- rrdtool-1.0.49-fc4.patch | 12 ++++++++++++ rrdtool.spec | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 rrdtool-1.0.49-fc4.patch diff --git a/rrdtool-1.0.49-fc4.patch b/rrdtool-1.0.49-fc4.patch new file mode 100644 index 0000000..bd5f622 --- /dev/null +++ b/rrdtool-1.0.49-fc4.patch @@ -0,0 +1,12 @@ +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 ++#include "../config.h" + #include "config_aux.h" + #endif + #endif diff --git a/rrdtool.spec b/rrdtool.spec index 3a54899..750dbb0 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -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 @@ RRDtool bindings to the PHP HTML-embedded scripting language. %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 @@ find examples/ contrib/ -type f -exec chmod 0644 {} \; %changelog +* Fri May 20 2005 Matthias Saou 1.0.49-5 +- Include patch from Michael to fix perl module compilation on FC4 (#156242). + * Fri May 20 2005 Matthias Saou 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.