rpms/rrdtool/devel rrdtool.spec,1.14,1.15

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	rrdtool.spec 
Log Message:
Merge spec fixes from bz 185909


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rrdtool.spec	4 Jun 2006 20:44:47 -0000	1.14
+++ rrdtool.spec	5 Jun 2006 19:18:51 -0000	1.15
@@ -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 @@
 %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 @@
 %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 @@
 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 @@
 %{python_sitearch}/rrdtoolmodule.so
 
 %changelog
+* Mon Jun 05 2006 Jarod Wilson <jwilson at redhat.com> 1.2.13-3
+- Merge spec fixes from bz 185909
+
 * Sun Jun 04 2006 Jarod Wilson <jwilson at redhat.com> 1.2.13-2
 - Remove explicit perl dep, version grabbing using rpm during
   rpmbuild not guaranteed to work (fails on ppc in plague),