From 2354c7e25b01dfbba9b758b2d832fb8eceda143b Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Mon, 5 Jun 2006 19:18:51 +0000 Subject: [PATCH] Merge spec fixes from bz 185909 --- rrdtool.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rrdtool.spec b/rrdtool.spec index 36de83f..9c7e053 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,15 +1,16 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.2.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Databases URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/ Source: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/pub/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +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-devel >= 2.3 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %{!?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]')} @@ -26,7 +27,7 @@ put a friendly user interface on it. %package devel Summary: RRDtool libraries and header files Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description devel RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -45,7 +46,7 @@ server load average). This package contains documentation on using RRD. %package -n perl-%{name} Summary: Perl RRDtool bindings Group: Development/Languages -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-perl <= %{version} Provides: %{name}-perl = %{version} @@ -57,7 +58,7 @@ Summary: Python RRDtool bindings Group: Development/Languages BuildRequires: python Requires: python >= %{python_version} -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description -n python-%{name} Python RRDtool bindings. @@ -168,6 +169,9 @@ find examples/ -type f -exec chmod 0644 {} \; %{python_sitearch}/rrdtoolmodule.so %changelog +* Mon Jun 05 2006 Jarod Wilson 1.2.13-3 +- Merge spec fixes from bz 185909 + * Sun Jun 04 2006 Jarod Wilson 1.2.13-2 - Remove explicit perl dep, version grabbing using rpm during rpmbuild not guaranteed to work (fails on ppc in plague),