rpms/rrdtool/FC-5 rrdtool.spec,1.27,1.28

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	rrdtool.spec 
Log Message:
Define %python_version *before* its needed (#237826)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rrdtool.spec	9 Apr 2007 14:47:00 -0000	1.27
+++ rrdtool.spec	25 Apr 2007 18:24:36 -0000	1.28
@@ -7,7 +7,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.19
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -59,6 +59,10 @@
 The Perl RRDtool bindings
 
 %if %{with_python}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')}
+# 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]' || echo "2.3")}
+
 %package python
 Summary: Python RRDtool bindings
 Group: Development/Languages
@@ -67,9 +71,6 @@
 Requires: %{name} = %{version}-%{release}
 Obsoletes: python-%{name} < %{version}-%{release}
 Provides: python-%{name} = %{version}-%{release}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')}
-# 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]' || echo "2.3")}
 
 %description python
 Python RRDtool bindings.
@@ -271,6 +272,9 @@
 %endif
 
 %changelog
+* Wed Apr 25 2007 Jarod Wilson <jwilson at redhat.com> 1.2.19-2
+- Define %%python_version *before* its needed (#237826)
+
 * Mon Apr 09 2007 Jarod Wilson <jwilson at redhat.com> 1.2.19-1
 - New upstream release