From 90b43b08d01f40e05a18e2427414febb6e593d42 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Sep 26 2013 17:26:07 +0000 Subject: Fixup tests in 0.1.15 to match the new list --- diff --git a/0001-Update-to-latest-suffix-list-and-fixup-test-01-accor.patch b/0001-Update-to-latest-suffix-list-and-fixup-test-01-accor.patch new file mode 100644 index 0000000..1029264 --- /dev/null +++ b/0001-Update-to-latest-suffix-list-and-fixup-test-01-accor.patch @@ -0,0 +1,36 @@ +From 4de80dc392aac497335c4e161404c781516dd099 Mon Sep 17 00:00:00 2001 +From: Yanko Kaneti +Date: Thu, 26 Sep 2013 20:12:54 +0300 +Subject: [PATCH] Update to latest suffix list and fixup test 01 accordingly + +--- + effective_tld_names.dat | 84 +++++++++++++++++++++++++++++++++++++++---------- + t/01-psuffix.t | 12 +++---- + 2 files changed, 73 insertions(+), 23 deletions(-) + +diff --git a/t/01-psuffix.t b/t/01-psuffix.t +index 7c812a3..d823209 100644 +--- a/t/01-psuffix.t ++++ b/t/01-psuffix.t +@@ -66,12 +66,12 @@ is public_suffix("www.test.kobe.jp"), "test.kobe.jp"; # Wildcard rule. + is public_suffix("city.kobe.jp"), "kobe.jp"; # Exception rule. + is public_suffix("www.city.kobe.jp"), "kobe.jp"; # Identity rule. + # TLD with a wildcard rule and exceptions. +-is public_suffix("om"), undef; +-is public_suffix("test.om"), "test.om"; +-is public_suffix("b.test.om"), "test.om"; +-is public_suffix("a.b.test.om"), "test.om"; +-is public_suffix("songfest.om"), "om"; +-is public_suffix("www.songfest.om"), "om"; ++is public_suffix("ck"), undef; ++is public_suffix("test.ck"), "test.ck"; ++is public_suffix("b.test.ck"), "test.ck"; ++is public_suffix("a.b.test.ck"), "test.ck"; ++is public_suffix("www.ck"), "ck"; ++is public_suffix("www.www.ck"), "ck"; + # US K12. + is public_suffix("us"), "us"; + is public_suffix("test.us"), "us"; +-- +1.8.3.1 + diff --git a/perl-Mozilla-PublicSuffix.spec b/perl-Mozilla-PublicSuffix.spec index 3c4ceb0..60c8450 100644 --- a/perl-Mozilla-PublicSuffix.spec +++ b/perl-Mozilla-PublicSuffix.spec @@ -11,6 +11,9 @@ Source0: http://www.cpan.org/authors/id/R/RS/RSIMOES/Mozilla-PublicSuffix # http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat?raw=1 Source1: effective_tld_names.dat +# https://github.com/rsimoes/Mozilla-PublicSuffix/pull/3 +Patch1: 0001-Update-to-latest-suffix-list-and-fixup-test-01-accor.patch + BuildArch: noarch BuildRequires: perl >= 0:5.008 BuildRequires: perl(File::Temp) @@ -31,6 +34,7 @@ From the official website at http://publicsuffix.org/ %prep %setup -q -n Mozilla-PublicSuffix-v%{version} +%patch1 -p1 -b .tests cp -a %{SOURCE1} ./ %build @@ -53,6 +57,7 @@ perl Build.PL installdirs=vendor 0.1.15-3.20130918 - Latest public suffix list from publicsuffix.org +- Fixup tests in 0.1.15 to match the new list * Sat Aug 03 2013 Fedora Release Engineering - 0.1.15-3.20130516 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild