[perl-App-cpanminus] Merge cpanminus back to perl-App-cpanminus

[Petr Pisar]

commit 293d58527cf17549e9b533da27859f95b023615c
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Mar 3 15:25:03 2011 +0100

    Merge cpanminus back to perl-App-cpanminus

 perl-App-cpanminus.spec |   41 ++++++++++++++++-------------------------
 1 files changed, 16 insertions(+), 25 deletions(-)
---
diff --git a/perl-App-cpanminus.spec b/perl-App-cpanminus.spec
index a75d820..c19e54c 100644
--- a/perl-App-cpanminus.spec
+++ b/perl-App-cpanminus.spec
@@ -10,6 +10,18 @@ BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Required by bin/cpanm
+Requires:       perl(Cwd)
+Requires:       perl(File::Path)
+Requires:       perl(File::Spec)
+Requires:       perl(Getopt::Long)
+Requires:       perl(LWP)
+Requires:       perl(Module::Build)
+Requires:       perl(Parse::CPAN::Meta)
+# XXX: Keep Provides: cpanminus to allow `yum install cpanminus' instead of
+# longer `yum install perl-App-cpanminus'.
+Provides:       cpanminus = %{version}-%{release}
+Obsoletes:      cpanminus <= %{version}-1.2002
 
 %{?filter_setup:
 %filter_from_requires /^perl(App::cpanminus::script)$/d
@@ -21,25 +33,6 @@ Why? It's dependency free, requires zero configuration, and stands alone
 but it's maintainable and extensible with plug-ins and friendly to shell 
 scripting. When running, it requires only 10 MB of RAM.
 
-# cpanminus subpackage exists only to allow `yum install cpanminus' instead of
-# `yum install perl-App-cpanminus'.
-%package -n cpanminus
-License:        GPL+ or Artistic
-Group:          Development/Libraries
-Summary:        Get, unpack, build and install modules from CPAN
-Requires:       %{name} = %{version}-%{release}
-Requires:       perl(Cwd)
-Requires:       perl(File::Path)
-Requires:       perl(File::Spec)
-Requires:       perl(Getopt::Long)
-Requires:       perl(LWP)
-Requires:       perl(Module::Build)
-Requires:       perl(Parse::CPAN::Meta)
-
-%description -n cpanminus
-cpanminus is a script to get, unpack, build and install modules from CPAN. 
-Dependency-free, zero configuration, standalone…
-
 %prep
 %setup -q -n App-cpanminus-%{version}
 
@@ -58,21 +51,19 @@ make test
 
 %files
 %defattr(-,root,root,-)
-%doc Changes
+%doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
-
-%files -n cpanminus
-%defattr(-,root,root,-)
-%doc README
-%{_bindir}/cpanm
 %{_mandir}/man1/*
+%{_bindir}/cpanm
 
 %changelog
 * Thu Mar 03 2011 Petr Pisar <ppisar at redhat.com> - 1.3000-1
 - 1.3000 bump
 - Clean up spec file
 - Require modules needed by cpanm
+- Merge cpanminus into main package as cpanminus required main package and
+  main package did not contain any code (i.e. was useless).
 
 * Thu Feb 17 2011 Petr Sabata <psabata at redhat.com> - 1.2001-1
 - 1.2001 bump