From 7ca116b9ff30be66a819e5da2d88a307b897ce2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 28 Aug 2012 16:35:51 +0200 Subject: [PATCH] Do not build-require itself --- perl-ExtUtils-MakeMaker.spec | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index a69cfdc..c10e196 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,40 +1,41 @@ -%global real_version 6.63_02 +%global cpan_version 6.63_02 Name: perl-ExtUtils-MakeMaker -Version: 6.63.02 -Release: 240%{?dist} +Version: %(echo '%{cpan_version}' | tr _ .) +Release: 241%{?dist} Summary: Create a module Makefile License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ExtUtils-MakeMaker/ -Source0: http://www.cpan.org/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-%{real_version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-%{cpan_version}.tar.gz # Do not set RPATH to perl shared-library modules by default. Bug #773622. # This is copy from `perl' package. This is distributor extension. Patch0: %{name}-6.62-USE_MM_LD_RUN_PATH.patch BuildArch: noarch -BuildRequires: perl(ExtUtils::MakeMaker) +# Makefile.Pl uses ExtUtils::MakeMaker from ./lib +BuildRequires: perl(Carp) +BuildRequires: perl(Cwd) +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Path) BuildRequires: perl(File::Spec) >= 0.8 +BuildRequires: perl(lib) # Unbundled BuildRequires: perl(File::Copy::Recursive) # Tests: BuildRequires: perl(AutoSplit) -BuildRequires: perl(Carp) BuildRequires: perl(CPAN::Meta) -BuildRequires: perl(Cwd) BuildRequires: perl(Data::Dumper) BuildRequires: perl(ExtUtils::Command) BuildRequires: perl(ExtUtils::Install) BuildRequires: perl(ExtUtils::Installed) BuildRequires: perl(ExtUtils::Manifest) -BuildRequires: perl(Exporter) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Temp) BuildRequires: perl(Getopt::Long) BuildRequires: perl(IO::File) BuildRequires: perl(lib) BuildRequires: perl(Parse::CPAN::Meta) BuildRequires: perl(Pod::Man) -BuildRequires: perl(File::Find) -BuildRequires: perl(File::Path) -BuildRequires: perl(File::Temp) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) # Optional tests @@ -59,7 +60,7 @@ Makefile.PL. It is based on the Makefile.SH model provided by Andy Dougherty and the perl5-porters. %prep -%setup -q -n ExtUtils-MakeMaker-%{real_version} +%setup -q -n ExtUtils-MakeMaker-%{cpan_version} %patch0 -p1 # Remove bundled modules rm -rf bundled/* ||: @@ -86,6 +87,10 @@ make test %{_mandir}/man3/* %changelog +* Tue Aug 28 2012 Petr Pisar - 6.63.02-241 +- Compute RPM version +- Do not build-require itself, the build script runs from ./lib + * Mon Aug 13 2012 Marcela Mašláňová - 6.63.02-240 - update version to the same as in perl.srpm - Bump release to override sub-package from perl.spec