commit 48e91b9c20012474f17f227be17c08042499e682
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Wed Sep 11 16:54:20 2013 +0100
Update to 1.005
- New upstream release 1.005
- Ensured no non-core test dependencies
- Various non-functional changes to files and metadata included with
the distribution
- Add patch with additional stopwords for the spell checker
- Reinstate EPEL support as we no longer require Capture::Tiny
Perl-OSType-1.005-old-Test::More.patch | 34 ++++++++++++++++++++++++++++++++
Perl-OSType-1.005-stopwords.patch | 11 ++++++++++
perl-Perl-OSType.spec | 33 ++++++++++++++++++++++++++++--
sources | 2 +-
4 files changed, 76 insertions(+), 4 deletions(-)
---
diff --git a/Perl-OSType-1.005-old-Test::More.patch b/Perl-OSType-1.005-old-Test::More.patch
new file mode 100644
index 0000000..11f447a
--- /dev/null
+++ b/Perl-OSType-1.005-old-Test::More.patch
@@ -0,0 +1,34 @@
+--- 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...
+
+@@ -65,5 +65,3 @@ can_ok( $test_pkg, @functions );
+ 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();
diff --git a/Perl-OSType-1.005-stopwords.patch b/Perl-OSType-1.005-stopwords.patch
new file mode 100644
index 0000000..407898e
--- /dev/null
+++ b/Perl-OSType-1.005-stopwords.patch
@@ -0,0 +1,11 @@
+--- lib/Perl/OSType.pm
++++ lib/Perl/OSType.pm
+@@ -103,6 +103,8 @@
+
+ =head1 DESCRIPTION
+
++=for :stopwords Unix Win32 Windows
++
+ Modules that provide OS-specific behaviors often need to know if
+ the current operating system matches a more generic type of
+ operating systems. For example, 'linux' is a type of 'Unix' operating system
diff --git a/perl-Perl-OSType.spec b/perl-Perl-OSType.spec
index e37ba7c..c241e00 100644
--- a/perl-Perl-OSType.spec
+++ b/perl-Perl-OSType.spec
@@ -1,11 +1,17 @@
+# 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)
+
Name: perl-Perl-OSType
-Version: 1.004
+Version: 1.005
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
+Patch1: Perl-OSType-1.005-old-Test::More.patch
+Patch2: Perl-OSType-1.005-stopwords.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
# Build
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -15,10 +21,11 @@ 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)
+BuildRequires: perl(IO::Handle)
+BuildRequires: perl(IPC::Open3)
BuildRequires: perl(List::Util)
BuildRequires: perl(Test::More)
# Optional tests, not run for this dual-lived module when bootstrapping
@@ -52,11 +59,20 @@ systems are given the type 'Windows' rather than 'Win32').
%prep
%setup -q -n Perl-OSType-%{version}
+# Fix test suite for Test::More < 0.88
+%if %{old_test_more}
+%patch1
+%endif
+
+# More stopwords for the spell checker
+%patch2
+
%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}
@@ -64,15 +80,26 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \;
%check
make test
%if !%{defined perl_bootstrap} && 0%{?fedora}
-make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
+LANG=en_US 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
+* Wed Sep 11 2013 Paul Howarth <paul@xxxxxxxxxxxx> - 1.005-1
+- Update to 1.005
+ - Ensured no non-core test dependencies
+ - Various non-functional changes to files and metadata included with
+ the distribution
+- Add patch with additional stopwords for the spell checker
+- Reinstate EPEL support as we no longer require Capture::Tiny
+
* Thu Aug 22 2013 Paul Howarth <paul@xxxxxxxxxxxx> - 1.004-1
- Update to 1.004
- 'bitrig' is a Unix
diff --git a/sources b/sources
index 700931e..8fdb518 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00db898f95253d4ac3bc45d9beb6815c Perl-OSType-1.004.tar.gz
+9a0c41e9ccd937ae0c865ac501cc0dc6 Perl-OSType-1.005.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
