Merge spec fixes from bz 185909
This commit is contained in:
parent
332f75037e
commit
2354c7e25b
14
rrdtool.spec
14
rrdtool.spec
@ -1,15 +1,16 @@
|
|||||||
Summary: Round Robin Database Tool to store and display time-series data
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.2.13
|
Version: 1.2.13
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
|
URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
|
||||||
Source: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/pub/%{name}-%{version}.tar.gz
|
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: gcc-c++, openssl-devel
|
||||||
BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
|
BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
|
||||||
BuildRequires: freetype-devel, python-devel >= 2.3
|
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_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]')}
|
%{!?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
|
%package devel
|
||||||
Summary: RRDtool libraries and header files
|
Summary: RRDtool libraries and header files
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
RRD is the Acronym for Round Robin Database. RRD is a system to store and
|
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}
|
%package -n perl-%{name}
|
||||||
Summary: Perl RRDtool bindings
|
Summary: Perl RRDtool bindings
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Obsoletes: %{name}-perl <= %{version}
|
Obsoletes: %{name}-perl <= %{version}
|
||||||
Provides: %{name}-perl = %{version}
|
Provides: %{name}-perl = %{version}
|
||||||
|
|
||||||
@ -57,7 +58,7 @@ Summary: Python RRDtool bindings
|
|||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
BuildRequires: python
|
BuildRequires: python
|
||||||
Requires: python >= %{python_version}
|
Requires: python >= %{python_version}
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description -n python-%{name}
|
%description -n python-%{name}
|
||||||
Python RRDtool bindings.
|
Python RRDtool bindings.
|
||||||
@ -168,6 +169,9 @@ find examples/ -type f -exec chmod 0644 {} \;
|
|||||||
%{python_sitearch}/rrdtoolmodule.so
|
%{python_sitearch}/rrdtoolmodule.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 05 2006 Jarod Wilson <jwilson@redhat.com> 1.2.13-3
|
||||||
|
- Merge spec fixes from bz 185909
|
||||||
|
|
||||||
* Sun Jun 04 2006 Jarod Wilson <jwilson@redhat.com> 1.2.13-2
|
* Sun Jun 04 2006 Jarod Wilson <jwilson@redhat.com> 1.2.13-2
|
||||||
- Remove explicit perl dep, version grabbing using rpm during
|
- Remove explicit perl dep, version grabbing using rpm during
|
||||||
rpmbuild not guaranteed to work (fails on ppc in plague),
|
rpmbuild not guaranteed to work (fails on ppc in plague),
|
||||||
|
Loading…
Reference in New Issue
Block a user