From 996d1befb82b895cc2bc685d7a2af6ba0b203e83 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 19 Jun 2006 17:55:57 +0000
Subject: [PATCH] Flip perl, php and python subpackage names around to conform
 more with     established standards

---
 rrdtool.spec | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/rrdtool.spec b/rrdtool.spec
index 08a3cad..97cb9de 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -4,7 +4,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.13
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -47,36 +47,40 @@ RRD is the Acronym for Round Robin Database. RRD is a system to store and
 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,25 +203,29 @@ find examples/ -type f -exec chmod 0644 {} \;
 %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
 %{php_extdir}/rrdtool.so
 
 %changelog
+* Mon Jun 19 2006 Jarod Wilson <jwilson@redhat.com> 1.2.13-6
+- Flip perl, php and python sub-package names around to 
+  conform with general practices
+
 * Sat Jun 10 2006 Jarod Wilson <jwilson@redhat.com> 1.2.13-5
 - Minor fixes to make package own created directories