diff --git a/.gitignore b/.gitignore index 9303f2a..92a62c2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ File-MimeInfo-0.15.tar.gz /File-MimeInfo-0.18.tar.gz /File-MimeInfo-0.19.tar.gz /File-MimeInfo-0.20.tar.gz +/File-MimeInfo-0.21.tar.gz diff --git a/perl-File-MimeInfo.spec b/perl-File-MimeInfo.spec index 5b8f020..07875f8 100644 --- a/perl-File-MimeInfo.spec +++ b/perl-File-MimeInfo.spec @@ -1,5 +1,5 @@ Name: perl-File-MimeInfo -Version: 0.20 +Version: 0.21 Release: 1%{?dist} Summary: Determine file type and open application License: GPL+ or Artistic @@ -65,6 +65,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Nov 04 2013 Jitka Plesnikova - 0.21-1 +- 0.21 bump + * Wed Oct 09 2013 Jitka Plesnikova - 0.20-1 - 0.20 bump diff --git a/sources b/sources index ded3811..a3fc6e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e87420787db163c03e5dd7fb47a3ef27 File-MimeInfo-0.20.tar.gz +7d55c8d1dc4e5c72e92b65f98a97ac92 File-MimeInfo-0.21.tar.gz diff --git a/tests514.patch b/tests514.patch deleted file mode 100644 index c1e3adb..0000000 --- a/tests514.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 807262f4aeb0694b6eabcc1acffecfa87e1df783 Mon Sep 17 00:00:00 2001 -From: Kent Fredric -Date: Sat, 7 May 2011 09:35:19 +1200 -Subject: [PATCH] Suggested fix for RT#66841 - -Replace regexp validation tests with similar tests that permit it to be -any one of a list of values. ---- - t/01_normal.t | 23 +++++++++++++++++------ - 1 files changed, 17 insertions(+), 6 deletions(-) - -diff --git a/t/01_normal.t b/t/01_normal.t -index 305da37..08c57f4 100644 ---- a/t/01_normal.t -+++ b/t/01_normal.t -@@ -18,12 +18,23 @@ use_ok('File::MimeInfo', qw/mimetype describe globs/); # 1 - - # test _glob_to_regexp - my $i = 0; --for ( -- [ '*.pl', '(?-xism:^.*\.pl$)' ], # 4 -- [ '*.h++', '(?-xism:^.*\.h\+\+$)' ], # 5 -- [ '*.[tar].*', '(?-xism:^.*\.[tar]\..*$)'], # 6 -- [ '*.?', '(?-xism:^.*\..?$)'], # 7 --) { is( File::MimeInfo::_glob_to_regexp($_->[0]), $_->[1], 'glob '.++$i ) } -+for my $glob ( -+ [ '*.pl', [ '(?-xism:^.*\.pl$)', '(?^u:^.*\.pl$)' ] ], # 4 -+ [ '*.h++', [ '(?-xism:^.*\.h\+\+$)', '(?^u:^.*\.h\+\+$)' ] ], # 5 -+ [ '*.[tar].*', [ '(?-xism:^.*\.[tar]\..*$)', '(?^u:^.*\.[tar]\..*$)' ] ], # 6 -+ [ '*.?', [ '(?-xism:^.*\..?$)', '(?^u:^.*\..?$)' ] ], # 7 -+ ) -+{ -+ my $converted = File::MimeInfo::_glob_to_regexp( $glob->[0] ); -+ my $number = ++$i; -+ if ( my ($match) = grep { $_ eq "$converted" } @{ $glob->[1] } ) { -+ pass( 'glob ' . $number . ' matches an expected value' ); -+ note explain $match; -+ next; -+ } -+ fail( 'glob ' . $number . ' matches an expected value' ); -+ diag explain { got => "$converted", expected_one_of => $glob->[1] }; -+} - - # test parsing file names - $i = 0; --- -1.7.5.rc3 -