From 57c2e2b8e1d22e226b5634f9919371db7d5a0cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Wed, 13 Jan 2010 11:45:19 +0000 Subject: [PATCH] - remove python_* macros clashing with the built-in ones - fix for new vendorlib directory --- rrdtool.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/rrdtool.spec b/rrdtool.spec index b1191d4..5e715d6 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -65,15 +65,15 @@ Provides: perl-%{name} = %{version}-%{release} 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")} +# Make sure the runtime python is newer than the build one; +# give a default value to handle parsing in cases when python is not present: +%{!?rrd_python_version: %define rrd_python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "3.14")} %package python Summary: Python RRDtool bindings Group: Development/Languages -BuildRequires: python-devel >= 2.3 -Requires: python >= %{python_version} +BuildRequires: python-devel +Requires: python >= %{rrd_python_version} Requires: %{name} = %{version}-%{release} Obsoletes: python-%{name} < %{version}-%{release} Provides: python-%{name} = %{version}-%{release} @@ -231,10 +231,10 @@ __EOF__ %endif # Pesky RRDp.pm... -%{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/ +%{__mv} $RPM_BUILD_ROOT%{perl_vendorlib}/RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/ # Dunno why this is getting installed here... -%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/../leaktest.pl +%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorlib}/leaktest.pl # We only want .txt and .html files for the main documentation %{__mkdir_p} doc2/html doc2/txt @@ -323,6 +323,10 @@ find examples/ -type f -exec chmod 0644 {} \; %endif %changelog +* Wed Jan 13 2010 Stepan Kasal - 1.3.8-6 +- remove python_* macros clashing with the built-in ones +- fix for new vendorlib directory + * Mon Dec 7 2009 Stepan Kasal - 1.3.8-5 - rebuild against perl 5.10.1