rpms/rrdtool/FC-4 rrdtool.spec,1.18,1.19

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	rrdtool.spec 
Log Message:
Take 2 on fix for no python in fc4 minimal buildroot...


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-4/rrdtool.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rrdtool.spec	1 Aug 2006 20:26:13 -0000	1.18
+++ rrdtool.spec	1 Aug 2006 20:40:38 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.15
-Release: 2%{?dist}.1
+Release: 2%{?dist}.2
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -15,10 +15,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-c++, openssl-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
-BuildRequires: freetype-devel, python >= 2.3, python-devel >= 2.3
+BuildRequires: freetype-devel, python-devel >= 2.3
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')}
-%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
+# eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot
+%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || 2.3)}
 
 %description
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -221,6 +222,9 @@
 %{php_extdir}/rrdtool.so
 
 %changelog
+* Tue Aug  1 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-2.2
+- Last change wasn't the correct route, take 2...
+
 * Tue Aug  1 2006 Jarod Wilson <jwilson at redhat.com> 1.2.15-2.1
 - Minimal FC4 buildroots don't include python, so add it as
   a BuildRequires.