rpms/rrdtool/devel rrdtool.spec,1.4,1.5

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	rrdtool.spec 
Log Message:
Clean up.



Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rrdtool.spec	9 Nov 2004 02:50:32 -0000	1.4
+++ rrdtool.spec	13 Jan 2005 18:27:47 -0000	1.5
@@ -1,25 +1,17 @@
-# $Id$
-# Authority: matthias
-# Upstream: Tobi Oetiker <oetiker$ee,ethz,ch>
-
-%define phpextdir %(php-config --extension-dir)
+%define php_extdir %(php-config --extension-dir || echo /usr/lib/php4)
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.0.49
-Release: 1.1.fc2.fr
+Release: 2
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildRequires: gcc-c++, perl, php-devel >= 4.0, openssl-devel
+BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
 BuildRequires: libpng-devel, zlib-devel
-Requires: perl >= %(rpm -q --qf '%%{epoch}:%%{version}' perl)
-Requires: libpng, zlib
 
 %description
 RRD is the Acronym for Round Robin Database. RRD is a system to store and 
@@ -56,8 +48,10 @@
 %setup
 %patch -b .phpfix
 
-### FIXME: Fixes to /usr/lib(64) for x86_64
-%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure contrib/php4/configure Makefile.in
+# Fixes to /usr/lib(64) for x86_64
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
+    configure contrib/php4/configure Makefile.in
+
 
 %build
 %configure \
@@ -91,7 +85,7 @@
 
 # Install the php4 module
 %{__install} -D -m0755 contrib/php4/modules/rrdtool.so \
-    %{buildroot}%{phpextdir}/rrdtool.so
+    %{buildroot}%{php_extdir}/rrdtool.so
 # Clean up the examples for inclusion as docs
 %{__rm} -rf contrib/php4/examples/CVS
 # Put the php config bit into place
@@ -115,10 +109,6 @@
 # This is so rpm doesn't pick up perl module dependencies automatically
 find examples/ contrib/ -type f -exec chmod 0644 {} \;
 
-# Put man pages back into place...
-#%{__mkdir_p} %{buildroot}%{_mandir}/
-#%{__mv} %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
-
 # Clean up the buildroot
 %{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/
 
@@ -153,10 +143,13 @@
 %defattr(-, root, root)
 %doc contrib/php4/examples contrib/php4/README
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
-%{phpextdir}/rrdtool.so
+%{php_extdir}/rrdtool.so
 
 
 %changelog
+* Thu Jan 13 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-2
+- Minor cleanups.
+
 * Thu Aug 25 2004 Dag Wieers <dag at wieers.com> - 1.0.49-1
 - Updated to release 1.0.49.