[perl-Carp-Clan] use perl_bootstrap macro

Marcela Mašláňová mmaslano at fedoraproject.org
Tue Jun 28 12:25:22 UTC 2011


commit db7e3fe0b861cfeb675e039b469438c44c896797
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Tue Jun 28 14:25:00 2011 +0200

    use perl_bootstrap macro

 perl-Carp-Clan.spec |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/perl-Carp-Clan.spec b/perl-Carp-Clan.spec
index 1356d62..f0e5c77 100644
--- a/perl-Carp-Clan.spec
+++ b/perl-Carp-Clan.spec
@@ -1,6 +1,6 @@
 Name:           perl-Carp-Clan
 Version:        6.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module to print improved warning messages
 
 Group:          Development/Libraries
@@ -11,8 +11,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
+%if !%{defined perl_bootstrap}
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Object::Deadly)
+%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -26,17 +28,6 @@ which shall never be blamed for any error.
 %prep
 %setup -q -n Carp-Clan-%{version}
 
-# Filter unwanted Provides:
-cat << EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(DB)/d'
-EOF
-
-%define __perl_provides %{_builddir}/Carp-Clan-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -51,8 +42,9 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
+%if !%{defined perl_bootstrap}
 make test
-
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 28 2011 Marcela Mašláňová <mmaslano at redhat.com> - 6.04-4
+- use perl_bootstrap macro
+
 * Wed Dec 15 2010 Marcela Maslanova <mmaslano at redhat.com> - 6.04-3
 - 661697 rebuild for fixing problems with vendorach/lib
 


More information about the scm-commits mailing list