commit e98f4a9c2eca4dc280a9c32c7ceecb3239d9ab52
Author: Paul Howarth <p...@city-fan.org>
Date:   Fri Aug 24 14:11:12 2012 +0100

    Spec clean-up
    
    - Merge tests sub-package back into main package
    - Don't need to remove empty directories from the buildroot
    - Drop %defattr, redundant since rpm 4.4
    - Make %files list more explicit
    - Don't use macros for commands
    - Mark Tutorial.pod as %doc
    - Drop explicit dependency on perl-devel

 perl-Test-Simple.spec |   69 +++++++++++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 27 deletions(-)
---
diff --git a/perl-Test-Simple.spec b/perl-Test-Simple.spec
index dd09aad..f51057f 100644
--- a/perl-Test-Simple.spec
+++ b/perl-Test-Simple.spec
@@ -1,14 +1,12 @@
 Name:           perl-Test-Simple
 Summary:        Basic utilities for writing tests
 Version:        0.98
-Release:        240%{?dist}
+Release:        241%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
-Source0:        
http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Test-Simple-%{version}.tar.gz
 
 URL:            http://search.cpan.org/dist/Test-Simple
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo 
$version))
+Source0:        
http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Test-Simple-%{version}.tar.gz
 
 BuildArch:      noarch
-
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Exporter)
@@ -17,21 +15,22 @@ BuildRequires:  perl(IO::Handle)
 BuildRequires:  perl(IO::Pipe)
 BuildRequires:  perl(lib)
 BuildRequires:  perl(Test::Harness) >= 2.03
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Data::Dumper)
 Requires:       perl(Test::Harness) >= 2.03
 
-# note this is right out of perl.spec
-Requires:       perl-devel
+# Drop old -tests subpackage (can be removed F21 development cycle)
+Obsoletes:      perl-Test-Simple-tests < %{version}-%{release}
+Provides:       perl-Test-Simple-tests = %{version}-%{release}
 
 ## testing
 #Requires:       perl-tests
 #Requires:       /usr/bin/prove
 
 %{?perl_default_filter}
-%{?perl_default_subpackage_tests}
 
 %description
-This package provides the bulk of the core testing facilities.  For more
+This package provides the bulk of the core testing facilities. For more
 information, see perldoc for Test::Simple, Test::More, etc.
 
 This package is the CPAN component of the dual-lifed core package Test-Simple.
@@ -40,15 +39,13 @@ This package is the CPAN component of the dual-lifed core 
package Test-Simple.
 %setup -q -n Test-Simple-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-
-%{_fixperms} %{buildroot}/*
+%{_fixperms} %{buildroot}
 
 %check
 make test
@@ -57,14 +54,34 @@ make test
 #prove -I %{buildroot}/blib -r t/
 
 %files
-%defattr(-,root,root,-)
-%doc Changes README examples/
-%{perl_vendorlib}/*
-%{_mandir}/man3/*.3*
+%doc Changes README examples/ t/
+%dir %{perl_vendorlib}/Test/
+%{perl_vendorlib}/Test/Builder.pm
+%{perl_vendorlib}/Test/Builder/
+%{perl_vendorlib}/Test/More.pm
+%{perl_vendorlib}/Test/Simple.pm
+%doc %{perl_vendorlib}/Test/Tutorial.pod
+%{_mandir}/man3/Test::Builder.3pm*
+%{_mandir}/man3/Test::Builder::IO::Scalar.3pm*
+%{_mandir}/man3/Test::Builder::Module.3pm*
+%{_mandir}/man3/Test::Builder::Tester.3pm*
+%{_mandir}/man3/Test::Builder::Tester::Color.3pm*
+%{_mandir}/man3/Test::More.3pm*
+%{_mandir}/man3/Test::Simple.3pm*
+%{_mandir}/man3/Test::Tutorial.3pm*
 
 %changelog
+* Thu Aug 23 2012 Paul Howarth <p...@city-fan.org> - 0.98-241
+- Merge tests sub-package back into main package
+- Don't need to remove empty directories from the buildroot
+- Drop %%defattr, redundant since rpm 4.4
+- Make %%files list more explicit
+- Don't use macros for commands
+- Mark Tutorial.pod as %%doc
+- Drop explicit dependency on perl-devel
+
 * Mon Aug 13 2012 Marcela Mašláňová <mmasl...@redhat.com> - 0.98-240
-- bump release to override sub-package from perl.spec
+- Bump release to override sub-package from perl.spec
 
 * Fri Jul 20 2012 Fedora Release Engineering <rel-...@lists.fedoraproject.org> 
- 0.98-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@@ -79,26 +96,24 @@ make test
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Tue Aug 16 2011 Marcela Mašláňová <mmasl...@redhat.com> - 0.98-3
-- change path on vendor, so our debuginfo are not conflicting with
+- Change path on vendor, so our debuginfo are not conflicting with
   perl core debuginfos
 
 * Fri Jun 17 2011 Marcela Mašláňová <mmasl...@redhat.com> - 0.98-2
 - Perl mass rebuild
 
-* Thu Feb 24 2011 Iain Arnell <iarn...@gmail.com> 0.98-1
-- update to latest upstream version
+* Thu Feb 24 2011 Iain Arnell <iarn...@gmail.com> - 0.98-1
+- Update to latest upstream version
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-...@lists.fedoraproject.org> 
- 0.96-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Sat Nov 20 2010 Iain Arnell <iarn...@gmail.com> 0.96-1
-- update to latest upstream version
-- clean up spec for modern rpmbuild
+* Sat Nov 20 2010 Iain Arnell <iarn...@gmail.com> - 0.96-1
+- Update to latest upstream version
+- Clean up spec for modern rpmbuild
 
 * Fri May 07 2010 Marcela Maslanova <mmasl...@redhat.com> - 0.94-2
 - Mass rebuild with perl-5.12.0
 
-* Tue Mar 16 2010 Chris Weyl <cw...@alumni.drew.edu> 0.94-1
-- specfile by Fedora::App::MaintainerTools 0.006
-
-
+* Tue Mar 16 2010 Chris Weyl <cw...@alumni.drew.edu> - 0.94-1
+- Specfile by Fedora::App::MaintainerTools 0.006
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel

Reply via email to