rpms/rrdtool/FC-3 rrdtool-1.0.49-php_config.patch, NONE, 1.1 rrdtool.spec, 1.6, 1.7 rrdtool-1.0.48-php_config.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	rrdtool.spec 
Added Files:
	rrdtool-1.0.49-php_config.patch 
Removed Files:
	rrdtool-1.0.48-php_config.patch 
Log Message:
Fix PHP module (#156716) and minor cleanups.


rrdtool-1.0.49-php_config.patch:

--- NEW FILE rrdtool-1.0.49-php_config.patch ---
--- contrib/php4/php_rrdtool.h.orig	2003-06-30 10:46:50.000000000 +0200
+++ contrib/php4/php_rrdtool.h	2004-08-25 20:15:28.172799056 +0200
@@ -12,6 +12,9 @@
 #ifndef _PHP4_RRDTOOL_H
 #define _PHP4_RRDTOOL_H
 
+#include "php_config.h"
+#include "config.h"
+
 #if COMPILE_DL_RRDTOOL
 #undef HAVE_RRDTOOL
 #define HAVE_RRDTOOL 1


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-3/rrdtool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rrdtool.spec	31 Jan 2005 17:17:30 -0000	1.6
+++ rrdtool.spec	20 May 2005 11:19:24 -0000	1.7
@@ -1,25 +1,25 @@
-%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4)
+%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.0.49
-Release: 3
+Release: 4%{?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-%{version}.tar.gz
-Patch: rrdtool-1.0.48-php_config.patch
+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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
 BuildRequires: libpng-devel, zlib-devel
 
 %description
-RRD is the Acronym for Round Robin Database. RRD is a system to store and 
-display time-series data (i.e. network bandwidth, machine-room temperature, 
-server load average). It stores the data in a very compact way that will not 
-expand over time, and it presents useful graphs by processing the data to 
-enforce a certain data density. It can be used either via simple wrapper 
-scripts (from shell or Perl) or via frontends that poll network devices and 
+RRD is the Acronym for Round Robin Database. RRD is a system to store and
+display time-series data (i.e. network bandwidth, machine-room temperature,
+server load average). It stores the data in a very compact way that will not
+expand over time, and it presents useful graphs by processing the data to
+enforce a certain data density. It can be used either via simple wrapper
+scripts (from shell or Perl) or via frontends that poll network devices and
 put a friendly user interface on it.
 
 
@@ -67,7 +67,7 @@
 %{__make} install DESTDIR="%{rrdtmpdir}"
 pushd contrib/php4
     ./configure \
-	--with-rrdtool="%{rrdtmpdir}%{_prefix}"
+        --with-rrdtool="%{rrdtmpdir}%{_prefix}"
     %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmpdir}
@@ -116,7 +116,7 @@
 %clean
 %{__rm} -rf %{buildroot}
 
- 
+
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc
@@ -147,6 +147,12 @@
 
 
 %changelog
+* 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.
+- Don't (yet) update to 1.0.50, as it introduces some changes in the perl
+  modules install.
+
 * Mon Jan 31 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-3
 - Put perl modules in vendor_perl and not site_perl. #146513
 


--- rrdtool-1.0.48-php_config.patch DELETED ---