rpms/rrdtool/FC-5 rrdtool.spec,1.18,1.19

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	rrdtool.spec 
Log Message:
flip subpackage names


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rrdtool.spec	16 Jun 2006 20:13:20 -0000	1.18
+++ rrdtool.spec	21 Jun 2006 14:18:35 -0000	1.19
@@ -4,7 +4,7 @@
 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}/
@@ -47,36 +47,40 @@
 display time-series data (i.e. network bandwidth, machine-room temperature,
 server load average). This package contains documentation on using RRD.
 
-%package -n perl-%{name}
+%package perl
 Summary: Perl RRDtool bindings
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Obsoletes: %{name}-perl <= %{version}
-Provides: %{name}-perl = %{version}-%{release}
+Obsoletes: perl-%{name} <= %{version}
+Provides: perl-%{name} = %{version}-%{release}
 
-%description -n perl-%{name}
+%description perl
 The Perl RRDtool bindings
 
-%package -n python-%{name}
+%package python
 Summary: Python RRDtool bindings
 Group: Development/Languages
 BuildRequires: python
 Requires: python >= %{python_version}
 Requires: %{name} = %{version}-%{release}
+Obsoletes: python-%{name} <= %{version}
+Provides: python-%{name} = %{version}-%{release}
 
-%description -n python-%{name}
+%description python
 Python RRDtool bindings.
 
-%package -n php-%{name}
+%package php
 Summary: PHP RRDtool bindings
 Group: Development/Languages
 BuildRequires: php-devel >= 4.0
 Requires: php >= 4.0
 Requires: %{name} = %{version}-%{release}
+Obsoletes: php-%{name} <= %{version}
+Provides: php-%{name} = %{version}-%{release}
 
-%description -n php-%{name}
-The php-%{name} package includes a dynamic shared object (DSO) that adds
+%description php
+The %{name}-php package includes a dynamic shared object (DSO) that adds
 RRDtool bindings to the PHP HTML-embedded scripting language.
 
 %prep
@@ -199,19 +203,19 @@
 %doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS
 %doc examples doc2/html doc2/txt
 
-%files -n perl-%{name}
+%files perl
 %defattr(-,root,root,-)
 %doc doc3/html
 %{_mandir}/man3/*
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
 
-%files -n python-%{name}
+%files python
 %defattr(-,root,root,-)
 %doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README
 %{python_sitearch}/rrdtoolmodule.so
 
-%files -n php-%{name}
+%files php
 %defattr(-,root,root,0755)
 %doc php4/examples php4/README
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
@@ -220,6 +224,10 @@
 
 
 %changelog
+* Wed Jun 21 2006 Jarod Wilson <jwilson at redhat.com> 1.2.13-3
+- Flip perl, php and python sub-package names around to
+  conform with general practices
+
 * Fri Jun 16 2006 Jarod Wilson <jwilson at redhat.com> 1.2.13-2
 - Tweaks for proper directory ownership