[perl-SQL-Abstract-Limit] Clean up, fix FTBFS

Paul Howarth pghmcfc at fedoraproject.org
Sat Aug 10 10:28:52 UTC 2013


commit cdb4ac3da8f18d255cef49abd95d605045ca9987
Author: Paul Howarth <paul at city-fan.org>
Date:   Sat Aug 10 11:12:17 2013 +0100

    Clean up, fix FTBFS
    
    - Don't BR: perl(DBD::AnyData) for test suite if we have a recent version of
      DBI as the current DBD::AnyData is incompatible with DBI > 1.622 and upstream
      rejected bugs about it (CPAN RT#83293); fixes FTBFS (#914311, #992717)
    - Classify buildreqs by usage
    - Get rid of spurious exec bits in shipped files
    - Don't use macros for commands
    - Drop %defattr, redundant since rpm 4.4
    - Use %{_fixperms} macro rather than our own chmod incantation
    - Don't need to remove empty directories from the buildroot
    - Make %files list more explicit

 perl-SQL-Abstract-Limit.spec |   69 ++++++++++++++++++++++++++++++-----------
 1 files changed, 50 insertions(+), 19 deletions(-)
---
diff --git a/perl-SQL-Abstract-Limit.spec b/perl-SQL-Abstract-Limit.spec
index a726e18..68687a7 100644
--- a/perl-SQL-Abstract-Limit.spec
+++ b/perl-SQL-Abstract-Limit.spec
@@ -1,21 +1,39 @@
 Name:           perl-SQL-Abstract-Limit
 Version:        0.141
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Portable LIMIT Emulation
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/SQL-Abstract-Limit
 Source0:        http://search.cpan.org/CPAN/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
-BuildRequires:	perl(SQL::Abstract) >= 1.2, perl(Test::Exception)
-BuildRequires:	perl(Class::DBI), perl(DBD::AnyData), perl(Test::More)
+# Module Build
+BuildRequires:  perl(ExtUtils::MakeMaker)
+# Module Runtime
+BuildRequires:  perl(base)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Class::DBI)
+BuildRequires:  perl(DBI::Const::GetInfoType)
+BuildRequires:  perl(SQL::Abstract) >= 1.2
+# Test Suite
+BuildRequires:  perl(Data::Dumper)
+# DBD::AnyData 0.110 incompatible with DBI ≥ 1.623 (CPAN RT#83293)
+%if 0%{?fedora} < 18 && 0%{?rhel} < 7
+BuildRequires:  perl(DBD::AnyData)
+%endif
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Test::Builder)
+BuildRequires:  perl(Test::Builder::Module)
 BuildRequires:  perl(Test::Deep)
-BuildRequires:  perl(Scalar::Util)
-BuildRequires:  perl(Data::Dumper)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod) >= 1.14
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
+# Runtime
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl(Class::DBI)
 
 %description
 Portable SQL LIMIT emulation, with support for multiple dialects and syntax 
@@ -24,30 +42,43 @@ models.
 %prep
 %setup -q -n SQL-Abstract-Limit-%{version}
 
+# Get rid of spurious exec bits
+find . -type f -exec chmod -c -x {} ';'
+
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-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 d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/SQL
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/SQL/
+%{_mandir}/man3/SQL::Abstract::Limit.3pm*
 
 %changelog
+* Sat Aug 10 2013 Paul Howarth <paul at city-fan.org> - 0.141-15
+- Don't BR: perl(DBD::AnyData) for test suite if we have a recent version of
+  DBI as the current DBD::AnyData is incompatible with DBI > 1.622 and upstream
+  rejected bugs about it (CPAN RT#83293); fixes FTBFS (#914311, #992717)
+- Classify buildreqs by usage
+- Get rid of spurious exec bits in shipped files
+- Don't use macros for commands
+- Drop %%defattr, redundant since rpm 4.4
+- Use %%{_fixperms} macro rather than our own chmod incantation
+- Don't need to remove empty directories from the buildroot
+- Make %%files list more explicit
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.141-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -73,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Wed Dec 22 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.141-6
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Thu May 06 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.141-5
 - Mass rebuild with perl-5.12.0



More information about the perl-devel mailing list