Update to 1.004
- New upstream release 1.004 - 'bitrig' is a Unix - Specify all dependencies - Drop EPEL-5/EPEL-6 support as they don't have Capture::Tiny - Always use aspell for the spell check as Pod::Wordlist::hanekomu explicitly sets the speller to aspell
This commit is contained in:
parent
e75c55dd74
commit
da5e5cb153
|
@ -1,30 +0,0 @@
|
|||
--- Makefile.PL
|
||||
+++ Makefile.PL
|
||||
@@ -4,7 +4,7 @@ use warnings;
|
||||
|
||||
use 5.006;
|
||||
|
||||
-use ExtUtils::MakeMaker 6.30;
|
||||
+use ExtUtils::MakeMaker;
|
||||
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ my %WriteMakefileArgs = (
|
||||
"constant" => 0
|
||||
},
|
||||
"CONFIGURE_REQUIRES" => {
|
||||
- "ExtUtils::MakeMaker" => "6.30"
|
||||
+ "ExtUtils::MakeMaker" => "0"
|
||||
},
|
||||
"DISTNAME" => "Perl-OSType",
|
||||
"EXE_FILES" => [],
|
||||
@@ -55,6 +55,9 @@ unless ( eval { ExtUtils::MakeMaker->VER
|
||||
delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
|
||||
unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
|
||||
|
||||
+delete $WriteMakefileArgs{LICENSE}
|
||||
+ unless eval { ExtUtils::MakeMaker->VERSION(6.31) };
|
||||
+
|
||||
WriteMakefile(%WriteMakefileArgs);
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
--- t/OSType.t
|
||||
+++ t/OSType.t
|
||||
@@ -1,7 +1,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 19;
|
||||
|
||||
use constant NON_EXISTENT_OS => 'titanix'; #the system they said could not go down...
|
||||
|
||||
@@ -66,6 +66,3 @@ can_ok( $test_pkg, @functions );
|
||||
ok( is_os_type( 'VOS' ), "$fcn: true" );
|
||||
ok( ! is_os_type(), "$fcn: false if no type provided" );
|
||||
}
|
||||
-
|
||||
-done_testing;
|
||||
-
|
||||
--- xt/release/test-version.t
|
||||
+++ xt/release/test-version.t
|
||||
@@ -1,6 +1,6 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
-use Test::More;
|
||||
+use Test::More tests => 2;
|
||||
|
||||
# generated by Dist::Zilla::Plugin::Test::Version 0.002004
|
||||
BEGIN { eval "use Test::Version; 1;" or die $@; }
|
||||
@@ -18,5 +18,4 @@ push @imports, $params
|
||||
|
||||
Test::Version->import(@imports);
|
||||
|
||||
-version_all_ok;
|
||||
-done_testing;
|
||||
+version_all_ok();
|
|
@ -1,33 +1,21 @@
|
|||
# We don't really need ExtUtils::MakeMaker ≥ 6.30
|
||||
%global old_eumm %(perl -MExtUtils::MakeMaker -e 'print (($ExtUtils::MakeMaker::VERSION < 6.30) ? 1 : 0);' 2>/dev/null || echo 0)
|
||||
|
||||
# Test suite needs patching if we have Test::More < 0.88
|
||||
%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
|
||||
|
||||
# Select the appropriate system speller
|
||||
%if %(perl -e 'print (($] >= 5.010000) ? 1 : 0);')
|
||||
%global speller hunspell
|
||||
%else
|
||||
%global speller aspell
|
||||
%endif
|
||||
|
||||
Name: perl-Perl-OSType
|
||||
Version: 1.003
|
||||
Release: 292%{?dist}
|
||||
Version: 1.004
|
||||
Release: 1%{?dist}
|
||||
Summary: Map Perl operating system names to generic types
|
||||
License: GPL+ or Artistic
|
||||
Group: Development/Libraries
|
||||
URL: http://search.cpan.org/dist/Perl-OSType/
|
||||
Source0: http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Perl-OSType-%{version}.tar.gz
|
||||
Patch0: Perl-OSType-1.003-old-EU::MM.patch
|
||||
Patch1: Perl-OSType-1.003-old-Test::More.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
||||
BuildArch: noarch
|
||||
# Build
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
# Module
|
||||
BuildRequires: perl(Exporter)
|
||||
BuildRequires: perl(strict)
|
||||
BuildRequires: perl(warnings)
|
||||
# Test Suite
|
||||
BuildRequires: perl(blib)
|
||||
BuildRequires: perl(Capture::Tiny)
|
||||
BuildRequires: perl(constant)
|
||||
BuildRequires: perl(File::Spec::Functions)
|
||||
BuildRequires: perl(File::Temp)
|
||||
|
@ -45,7 +33,7 @@ BuildRequires: perl(Test::Perl::Critic)
|
|||
BuildRequires: perl(Test::Pod)
|
||||
BuildRequires: perl(Test::Pod::Coverage)
|
||||
BuildRequires: perl(Test::Portability::Files)
|
||||
BuildRequires: perl(Test::Spelling), %{speller}-en
|
||||
BuildRequires: perl(Test::Spelling), aspell-en
|
||||
BuildRequires: perl(Test::Version)
|
||||
%endif
|
||||
# Runtime
|
||||
|
@ -64,22 +52,11 @@ systems are given the type 'Windows' rather than 'Win32').
|
|||
%prep
|
||||
%setup -q -n Perl-OSType-%{version}
|
||||
|
||||
# We don't really need ExtUtils::MakeMaker ≥ 6.30
|
||||
%if %{old_eumm}
|
||||
%patch0
|
||||
%endif
|
||||
|
||||
# Fix test suite for Test::More < 0.88
|
||||
%if %{old_test_more}
|
||||
%patch1
|
||||
%endif
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make pure_install DESTDIR=%{buildroot}
|
||||
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
|
||||
%{_fixperms} %{buildroot}
|
||||
|
@ -90,15 +67,20 @@ make test
|
|||
make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%doc Changes CONTRIBUTING LICENSE README
|
||||
%{perl_vendorlib}/Perl/
|
||||
%{_mandir}/man3/Perl::OSType.3pm*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 22 2013 Paul Howarth <paul@city-fan.org> - 1.004-1
|
||||
- Update to 1.004
|
||||
- 'bitrig' is a Unix
|
||||
- Specify all dependencies
|
||||
- Drop EPEL-5/EPEL-6 support as they don't have Capture::Tiny
|
||||
- Always use aspell for the spell check as Pod::Wordlist::hanekomu explicitly
|
||||
sets the speller to aspell
|
||||
|
||||
* Wed Aug 14 2013 Jitka Plesnikova <jplesnik@redhat.com> - 1.003-292
|
||||
- Perl 5.18 re-rebuild of bootstrapped packages
|
||||
|
||||
|
|
Loading…
Reference in New Issue