From 088eab124ce6289c83f2d7ab1236ca448a3487e5 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Apr 07 2007 00:37:17 +0000 Subject: Update to 0.78. BR Archive::Tar, ExtUtils::MakeMaker, and IO::Zlib. Drop the AUTOINSTALL=1. It isn't necessary anymore. Drop the find -size 0. That shouldn't be necessary for noarch packages. Filter out Log::Message::Handlers auto-provides. --- diff --git a/.cvsignore b/.cvsignore index 732e227..f04e6e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -CPANPLUS-0.076.tar.gz +CPANPLUS-0.78.tar.gz diff --git a/CPANPLUS-filter-provides.sh b/CPANPLUS-filter-provides.sh new file mode 100644 index 0000000..01a0704 --- /dev/null +++ b/CPANPLUS-filter-provides.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +@@PERL_PROV@@ "$@" | sed -e '/^perl(Log::Message::Handlers)$/d' diff --git a/perl-CPANPLUS.spec b/perl-CPANPLUS.spec index 76b8dc1..04107cf 100644 --- a/perl-CPANPLUS.spec +++ b/perl-CPANPLUS.spec @@ -1,6 +1,6 @@ Name: perl-CPANPLUS -Version: 0.076 -Release: 2%{?dist} +Version: 0.78 +Release: 1%{?dist} Summary: API & CLI access to the CPAN mirrors License: GPL or Artistic Group: Development/Libraries @@ -9,6 +9,7 @@ Source0: http://www.cpan.org/authors/id/K/KA/KANE/CPANPLUS-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Extract) >= 0.07 +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Fetch) >= 0.07 BuildRequires: perl(IPC::Cmd) >= 0.24 BuildRequires: perl(IPC::Run) >= 0.79 @@ -21,8 +22,10 @@ BuildRequires: perl(Module::Pluggable) >= 2.4 BuildRequires: perl(Object::Accessor) >= 0.03 BuildRequires: perl(Params::Check) >= 0.22 BuildRequires: perl(Term::UI) >= 0.05 -%{?_with_check:BuildRequires: perl(Package::Constants)} +%{?_with_check:BuildRequires: perl(Archive::Tar) >= 1.23} +%{?_with_check:BuildRequires: perl(IO::Zlib) >= 1.04} %{?_with_check:BuildRequires: perl(Module::CoreList)} +%{?_with_check:BuildRequires: perl(Package::Constants)} Requires: perl(IPC::Run) >= 0.79 Requires: perl(Module::Pluggable) >= 2.4 Requires: perl(Module::CoreList) @@ -32,6 +35,10 @@ Source98: CPANPLUS-filter-requires.sh %global real_perl_requires %{__perl_requires} %define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires +Source99: CPANPLUS-filter-provides.sh +%global real_perl_provides %{__perl_provides} +%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides + %description The CPANPLUS library is an API to the CPAN mirrors and a collection of interactive shells, commandline programs, etc, that use this API. @@ -42,10 +49,13 @@ interactive shells, commandline programs, etc, that use this API. sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} +sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides} +chmod +x %{__perl_provides} + perl -pi -e 'print "#!/usr/bin/perl\n\n" if ($. == 1)' bin/cpanp-run-perl %build -%{__perl} Makefile.PL INSTALLDIRS=vendor AUTOINSTALL=1 +%{__perl} Makefile.PL INSTALLDIRS=vendor #AUTOINSTALL=1 make %{?_smp_mflags} %install @@ -54,7 +64,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type f -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* @@ -63,7 +72,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{?_with_check:make test} %clean -rm -rf $RPM_BUILD_ROOT %{__perl_requires} +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides} %files %defattr(-,root,root,-) @@ -74,6 +83,13 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{_mandir}/man3/* %changelog +* Wed Apr 04 2007 Steven Pritchard 0.78-1 +- Update to 0.78. +- BR Archive::Tar, ExtUtils::MakeMaker, and IO::Zlib. +- Drop the AUTOINSTALL=1. It isn't necessary anymore. +- Drop the find -size 0. That shouldn't be necessary for noarch packages. +- Filter out Log::Message::Handlers auto-provides. + * Tue Jan 30 2007 Steven Pritchard 0.076-2 - Add missing explicit dependencies on IPC::Run, Module::CoreList, and Module::Pluggable (#225357). diff --git a/sources b/sources index 76edeb5..0971256 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a301bb6240ded8eea9f33ce7c8f969fb CPANPLUS-0.076.tar.gz +bd14f33f193515e401bef67b957617d7 CPANPLUS-0.78.tar.gz