From ea39459f42f921e84504617dda3844520d0dd9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 3 Mar 2011 15:03:16 +0100
Subject: [PATCH] 1.3000 bump

Consolidate dependencies.
---
 .gitignore              |  1 +
 perl-App-cpanminus.spec | 63 +++++++++++++++++++++--------------------
 sources                 |  2 +-
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 86e6d13..5d245b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ App-cpanminus-0.9935.tar.gz
 /App-cpanminus-1.1007.tar.gz
 /App-cpanminus-1.1008.tar.gz
 /App-cpanminus-1.2001.tar.gz
+/App-cpanminus-1.3000.tar.gz
diff --git a/perl-App-cpanminus.spec b/perl-App-cpanminus.spec
index f720fab..a75d820 100644
--- a/perl-App-cpanminus.spec
+++ b/perl-App-cpanminus.spec
@@ -1,63 +1,61 @@
 Name:           perl-App-cpanminus
-Version:        1.2001
+Version:        1.3000
 Release:        1%{?dist}
 Summary:        Library for get, unpack, build and install CPAN modules
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/App-cpanminus/
 Source0:        http://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(LWP)
-BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::More)
-Requires:       perl(LWP)
-Requires:       perl(Module::Build)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-%description
-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 10MB of RAM.
-
-%package -n cpanminus
-License:        GPL+ or Artistic
-Group:          Development/Libraries
-Summary:        Get, unpack, build and install modules from CPAN
-Requires:      %{name} = %{version}-%{release}
-
-%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}
 %{?filter_setup:
 %filter_from_requires /^perl(App::cpanminus::script)$/d
 %?perl_default_filter
 }
 
+%description
+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}
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make pure_install DESTDIR=$RPM_BUILD_ROOT
-
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %doc Changes
@@ -71,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Mar 03 2011 Petr Pisar <ppisar@redhat.com> - 1.3000-1
+- 1.3000 bump
+- Clean up spec file
+- Require modules needed by cpanm
+
 * Thu Feb 17 2011 Petr Sabata <psabata@redhat.com> - 1.2001-1
 - 1.2001 bump
 
diff --git a/sources b/sources
index 04264f1..c54539a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-312f34b7b0045d228195b3c676682cd0  App-cpanminus-1.2001.tar.gz
+35710478a9247b86bec127ebfdea6b92  App-cpanminus-1.3000.tar.gz