From 00ef6eca93a30e38f6409f4a9689e18b2adc87788bb53bd759134675d0605b3a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 4 Jan 2015 13:18:25 +0000 Subject: [PATCH] - Date::Calc's parse logic puts 3.1.64 into 2064 if it's closer to $NOW than 1964, which is the case since 1.1.2015 updated Date-Calc-6.3.diff for https://rt.cpan.org/Public/Bug/Display.html?id=101232 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Date-Calc?expand=0&rev=24 --- Date-Calc-6.3.diff | 713 +++++++++++++++++++++++++++++++++++------ perl-Date-Calc.changes | 8 + perl-Date-Calc.spec | 16 +- 3 files changed, 636 insertions(+), 101 deletions(-) diff --git a/Date-Calc-6.3.diff b/Date-Calc-6.3.diff index 58b9321..99fb45f 100644 --- a/Date-Calc-6.3.diff +++ b/Date-Calc-6.3.diff @@ -1,104 +1,635 @@ ---- examples/age_in_days_eu.pl -+++ examples/age_in_days_eu.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w +Index: Date-Calc-6.3/t/f027.t +=================================================================== +--- Date-Calc-6.3.orig/t/f027.t ++++ Date-Calc-6.3/t/f027.t +@@ -43,107 +43,107 @@ if ((($year,$mm,$dd) = Decode_Date_US2(" + $n++; - ############################################################################### - ## ## ---- examples/age_in_days_us.pl -+++ examples/age_in_days_us.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w + if ((($year,$mm,$dd) = Decode_Date_US2("_1364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/anniversaries.pl -+++ examples/anniversaries.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w + if ((($year,$mm,$dd) = Decode_Date_US2("_01364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/bug.pl -+++ examples/bug.pl -@@ -1,4 +1,4 @@ --#!perl -+#!/usr/bin/perl + if ((($year,$mm,$dd) = Decode_Date_US2("_001364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - BEGIN { eval { require bytes; }; } - use strict; ---- examples/delta.pl -+++ examples/delta.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w + if ((($year,$mm,$dd) = Decode_Date_US2("_10364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/holidays.pl -+++ examples/holidays.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w + if ((($year,$mm,$dd) = Decode_Date_US2("_010364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/income.pl -+++ examples/income.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w + if ((($year,$mm,$dd) = Decode_Date_US2("_0010364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/linearcal.pl -+++ examples/linearcal.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w + if ((($year,$mm,$dd) = Decode_Date_US2("_110364_")) && +-($year==1964) && ($mm==11) && ($dd==3)) ++($year==2064) && ($mm==11) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/nth_weekday.pl -+++ examples/nth_weekday.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w + if ((($year,$mm,$dd) = Decode_Date_US2("_0110364_")) && +-($year==1964) && ($mm==11) && ($dd==3)) ++($year==2064) && ($mm==11) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/time.pl -+++ examples/time.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w + if ((($year,$mm,$dd) = Decode_Date_US2("_00110364_")) && +-($year==1964) && ($mm==11) && ($dd==3)) ++($year==2064) && ($mm==11) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/vacation.pl -+++ examples/vacation.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w +-if ((($year,$mm,$dd) = Decode_Date_US2("_1031964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_1032064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- examples/weiberfastnacht.pl -+++ examples/weiberfastnacht.pl -@@ -1,4 +1,4 @@ --#!perl -w -+#!/usr/bin/perl -w +-if ((($year,$mm,$dd) = Decode_Date_US2("_01031964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_01032064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## ---- tools/compile.pl -+++ tools/compile.pl -@@ -1,4 +1,4 @@ --#!perl -+#!/usr/bin/perl +-if ((($year,$mm,$dd) = Decode_Date_US2("_001031964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_001032064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_11031964_")) && +-($year==1964) && ($mm==11) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_11032064_")) && ++($year==2064) && ($mm==11) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_011031964_")) && +-($year==1964) && ($mm==11) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_011032064_")) && ++($year==2064) && ($mm==11) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_0011031964_")) && +-($year==1964) && ($mm==11) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_0011032064_")) && ++($year==2064) && ($mm==11) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_1_3_64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_1_3_1964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_1_3_2064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_jan_3_64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_Jan_3_64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_jAN_3_64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_January_3_64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +@@ -151,68 +151,68 @@ unless (($year,$mm,$dd) = Decode_Date_US + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2(" January 3rd, 1964 ")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2(" January 3rd, 2064 ")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_Jan364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_Jan0364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_Jan00364_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_Jan2264_")) && +-($year==1964) && ($mm==1) && ($dd==22)) ++($year==2064) && ($mm==1) && ($dd==22)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_Jan02264_",0)) && +-($year==1964) && ($mm==1) && ($dd==22)) ++($year==2064) && ($mm==1) && ($dd==22)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_Jan002264_",'')) && +-($year==1964) && ($mm==1) && ($dd==22)) ++($year==2064) && ($mm==1) && ($dd==22)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_ja31964_",1)) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_ja32064_",1)) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_ja031964_",2)) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_ja032064_",2)) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_ja0031964_",3)) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_ja0032064_",3)) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_ja221964_",undef)) && +-($year==1964) && ($mm==1) && ($dd==22)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_ja222064_",undef)) && ++($year==2064) && ($mm==1) && ($dd==22)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_ja0221964_")) && +-($year==1964) && ($mm==1) && ($dd==22)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_ja0222064_")) && ++($year==2064) && ($mm==1) && ($dd==22)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_ja00221964_")) && +-($year==1964) && ($mm==1) && ($dd==22)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_ja00222064_")) && ++($year==2064) && ($mm==1) && ($dd==22)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +@@ -220,22 +220,22 @@ unless (($year,$mm,$dd) = Decode_Date_US + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-unless (($year,$mm,$dd) = Decode_Date_US2("_ja331964_")) ++unless (($year,$mm,$dd) = Decode_Date_US2("_ja332064_")) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("x000001x000003x000064x")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US2("_ja_000003x000064x")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_US2("_Janeiro_3_dia_tres_de_janeiro_de_1964_mil_novecentos_sessenta_e_seis_",Decode_Language("Portug"))) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US2("_Janeiro_3_dia_tres_de_janeiro_de_2064_mil_novecentos_sessenta_e_seis_",Decode_Language("Portug"))) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +Index: Date-Calc-6.3/t/f028.t +=================================================================== +--- Date-Calc-6.3.orig/t/f028.t ++++ Date-Calc-6.3/t/f028.t +@@ -43,132 +43,132 @@ if ((($year,$mm,$dd) = Decode_Date_EU2(" + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_3164_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_03164_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_003164_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_30164_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_030164_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_0030164_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_110364_")) && +-($year==1964) && ($mm==3) && ($dd==11)) ++($year==2064) && ($mm==3) && ($dd==11)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_0110364_")) && +-($year==1964) && ($mm==3) && ($dd==11)) ++($year==2064) && ($mm==3) && ($dd==11)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_00110364_")) && +-($year==1964) && ($mm==3) && ($dd==11)) ++($year==2064) && ($mm==3) && ($dd==11)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_3011964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_3012064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_03011964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_03012064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_003011964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_003012064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_11031964_")) && +-($year==1964) && ($mm==3) && ($dd==11)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_11032064_")) && ++($year==2064) && ($mm==3) && ($dd==11)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_011031964_")) && +-($year==1964) && ($mm==3) && ($dd==11)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_011032064_")) && ++($year==2064) && ($mm==3) && ($dd==11)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_0011031964_")) && +-($year==1964) && ($mm==3) && ($dd==11)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_0011032064_")) && ++($year==2064) && ($mm==3) && ($dd==11)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_3_1_64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_3_1_1964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_3_1_2064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_3_jan_64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_3_Jan_64_",0)) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_3_jAN_64_",1)) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_3-JAN-64_",2)) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_3-Jan-1964_",3)) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_3-Jan-2064_",3)) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_3-January-1964_",'')) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_3-January-2064_",'')) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_000003-Jan-000064_",undef)) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_000003-Jan-001964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_000003-Jan-002064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_3_ja_64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +@@ -177,42 +177,42 @@ unless (($year,$mm,$dd) = Decode_Date_EU + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_3ja64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_03ja64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_003ja64_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("_000003ja000064_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_3ja1964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_3ja2064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_03ja1964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_03ja2064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_003ja1964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_003ja2064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_000003ja001964_")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_000003ja002064_")) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +@@ -220,22 +220,22 @@ unless (($year,$mm,$dd) = Decode_Date_EU + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-unless (($year,$mm,$dd) = Decode_Date_EU2("_33ja1964_")) ++unless (($year,$mm,$dd) = Decode_Date_EU2("_33ja2064_")) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("x000003x000001x000064x")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + + if ((($year,$mm,$dd) = Decode_Date_EU2("x000003_ja_000064x")) && +-($year==1964) && ($mm==1) && ($dd==3)) ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +-if ((($year,$mm,$dd) = Decode_Date_EU2("_dia_tres_3_janeiro_1964_mil_novecentos_sessenta_e_seis_",Decode_Language("Portug"))) && +-($year==1964) && ($mm==1) && ($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU2("_dia_tres_3_janeiro_2064_mil_novecentos_sessenta_e_seis_",Decode_Language("Portug"))) && ++($year==2064) && ($mm==1) && ($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +Index: Date-Calc-6.3/t/f016.t +=================================================================== +--- Date-Calc-6.3.orig/t/f016.t ++++ Date-Calc-6.3/t/f016.t +@@ -17,51 +17,51 @@ print "1..25\n"; + + $n = 1; + if ((($year,$mm,$dd) = Decode_Date_EU("3.1.64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("3 1 64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("03.01.64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("03/01/64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; +-if ((($year,$mm,$dd) = Decode_Date_EU("3. Ene 1964",4)) && +-($year==1964)&&($mm==1)&&($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU("3. Ene 2064",4)) && ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("Geburtstag: 3. Januar '64 in Backnang/Württemberg",3)) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("03-Jan-64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; +-if ((($year,$mm,$dd) = Decode_Date_EU("3.Jan1964",6)) && +-($year==1964)&&($mm==1)&&($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_EU("3.Jan2064",6)) && ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("3Jan64",0)) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("030164")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("3ja64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_EU("3164")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + +@@ -74,39 +74,39 @@ unless (($year,$mm,$dd) = Decode_Date_EU + $n++; + + if ((($year,$mm,$dd) = Decode_Date_US("1 3 64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_US("01/03/64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_US("Jan 3 '64")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; +-if ((($year,$mm,$dd) = Decode_Date_US("Jan 3 1964")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US("Jan 3 2064")) && ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; +-if ((($year,$mm,$dd) = Decode_Date_US("===> January 3rd 1964 (birthday)")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US("===> January 3rd 2064 (birthday)")) && ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; +-if ((($year,$mm,$dd) = Decode_Date_US("Jan31964")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++if ((($year,$mm,$dd) = Decode_Date_US("Jan32064")) && ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_US("Jan364")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_US("ja364")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + if ((($year,$mm,$dd) = Decode_Date_US("1364")) && +-($year==1964)&&($mm==1)&&($dd==3)) ++($year==2064)&&($mm==1)&&($dd==3)) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; - ############################################################################### - ## ## diff --git a/perl-Date-Calc.changes b/perl-Date-Calc.changes index b3b4256..37f5735 100644 --- a/perl-Date-Calc.changes +++ b/perl-Date-Calc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jan 4 13:16:20 UTC 2015 - coolo@suse.com + +- Date::Calc's parse logic puts 3.1.64 into 2064 if it's closer to + $NOW than 1964, which is the case since 1.1.2015 + updated Date-Calc-6.3.diff for + https://rt.cpan.org/Public/Bug/Display.html?id=101232 + ------------------------------------------------------------------- Mon Apr 15 11:02:18 UTC 2013 - idonmez@suse.com diff --git a/perl-Date-Calc.spec b/perl-Date-Calc.spec index b8b811c..d009eda 100644 --- a/perl-Date-Calc.spec +++ b/perl-Date-Calc.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Date-Calc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,16 @@ Name: perl-Date-Calc -BuildRequires: perl-Bit-Vector +BuildRequires: perl(Bit::Vector) >= 7.1 +BuildRequires: perl(Carp::Clan) >= 6.04 +Requires: perl(Bit::Vector) >= 7.1 +Requires: perl(Carp::Clan) >= 6.04 BuildRequires: perl-macros Version: 6.3 Release: 0 Provides: DateCalc Provides: perl_dc Obsoletes: perl_dc -Requires: perl-Bit-Vector Url: http://search.cpan.org/perldoc?Date::Calc Summary: Perl Date-Calc Module License: Artistic-1.0 or GPL-2.0+ @@ -62,15 +64,9 @@ could ever imagine automagically for you; it is rather intended to serve as a toolbox (in the best of UNIX spirit and traditions) which should, however, always get you where you want to go. - - -Authors: --------- - Steffen Beyer - %prep %setup -n Date-Calc-%{version} -q -#%patch +%patch -p1 %build perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall"