[perl-Class-Accessor-Classy] Fixed some minor errors when building for EPEL < 6

jcp jcp at fedoraproject.org
Sat Oct 19 19:40:17 UTC 2013


commit 14b184bfc16c08bddf05dddfccce0f7f2b54b828
Author: John C. Peterson <jcp at eskimo.com>
Date:   Sat Oct 19 12:38:06 2013 -0700

    Fixed some minor errors when building for EPEL < 6

 perl-Class-Accessor-Classy.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/perl-Class-Accessor-Classy.spec b/perl-Class-Accessor-Classy.spec
index dd1eae8..5c9d812 100644
--- a/perl-Class-Accessor-Classy.spec
+++ b/perl-Class-Accessor-Classy.spec
@@ -3,7 +3,7 @@
 
 Name:           perl-%{mod_basename}
 Version:        0.9.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Accessors with minimal inheritance
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -19,7 +19,7 @@ BuildRequires:  perl(Module::Build) >= 0.28
 BuildRequires:  perl(attributes)
 BuildRequires:  perl(version)
 BuildRequires:  perl(Test::More)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 The Class::Accessor::Classy Perl module provides an extremely small
@@ -37,11 +37,11 @@ generated are of the form C<foo()> and C<set_foo()>, respectively.
 
 %build
 # Using Module::Build since a Build.PL is present
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL installdirs=vendor
 ./Build
 
 %install
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 6
 rm -rf %{buildroot}
 %endif
 ./Build install destdir=%{buildroot} create_packlist=0
@@ -51,18 +51,22 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 %check
 ./Build test
 
+%if 0%{?rhel} && 0%{?rhel} < 6
 %clean
-%if 0%{?rhel}
 rm -rf %{buildroot}
 %endif
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 17 2013 John C. Peterson <jcp at eskimo.com> 0.9.1-5
+- Fixed some errors in conditional tests for when to remove buildroot (RHEL < 6)
+- Removed the redundant defattr macro from the files section
+- Replaced all occurances of the __perl macro with just perl
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list