rpms/rrdtool/devel rrdtool-1.0.49-php_config.patch, NONE, 1.1 rrdtool.spec, 1.8, 1.9 rrdtool-1.0.48-php_config.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

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

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/devel/rrdtool.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rrdtool.spec	6 Apr 2005 22:13:31 -0000	1.8
+++ rrdtool.spec	20 May 2005 11:22:32 -0000	1.9
@@ -1,15 +1,14 @@
-%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: 4
-
+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
@@ -148,8 +147,11 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* 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 ---