- fix test suite

- rel 11

diff --git a/Date-Pcalc-6.1-century.patch b/Date-Pcalc-6.1-century.patch
new file mode 100644 (file)
index 0000000..614033d
--- /dev/null
+++ b/Date-Pcalc-6.1-century.patch
@@ -0,0 +1,433 @@
+From d8fddafea015740755ddcb24da1388996303502f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
+Date: Wed, 7 Jan 2015 14:40:19 +0100
+Subject: [PATCH] Adapt the test suite for the next 100 years
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We're now closer to year 2064 than 1964, therefore dates with two-digit
+years decode differently now.
+
+Signed-off-by: Petr Šabata <contyk@redhat.com>
+---
+ t/f016.t | 32 ++++++++++++++++----------------
+ t/f027.t | 44 ++++++++++++++++++++++----------------------
+ t/f028.t | 44 ++++++++++++++++++++++----------------------
+ 3 files changed, 60 insertions(+), 60 deletions(-)
+
+diff --git a/t/f016.t b/t/f016.t
+index 98069a4..60cc3fa 100644
+--- a/t/f016.t
++++ b/t/f016.t
+@@ -15,19 +15,19 @@ 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)) &&
+@@ -35,11 +35,11 @@ if ((($year,$mm,$dd) = Decode_Date_EU("3. Ene 1964",4)) &&
+ {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)) &&
+@@ -47,19 +47,19 @@ if ((($year,$mm,$dd) = Decode_Date_EU("3.Jan1964",6)) &&
+ {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++;
+ 
+@@ -72,15 +72,15 @@ unless (($year,$mm,$dd) = Decode_Date_EU("29.2.1995"))
+ $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")) &&
+@@ -96,15 +96,15 @@ if ((($year,$mm,$dd) = Decode_Date_US("Jan31964")) &&
+ {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/t/f027.t b/t/f027.t
+index 3070fd7..4a686dc 100644
+--- a/t/f027.t
++++ b/t/f027.t
+@@ -41,47 +41,47 @@ if ((($year,$mm,$dd) = Decode_Date_US2("_00134_")) &&
+ $n++;
+ 
+ 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++;
+ 
+ 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++;
+ 
+ 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++;
+ 
+ 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++;
+ 
+ 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++;
+ 
+ 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++;
+ 
+ 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++;
+ 
+ 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++;
+ 
+ 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++;
+ 
+@@ -116,7 +116,7 @@ if ((($year,$mm,$dd) = Decode_Date_US2("_0011031964_")) &&
+ $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++;
+ 
+@@ -126,22 +126,22 @@ if ((($year,$mm,$dd) = Decode_Date_US2("_1_3_1964_")) &&
+ $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++;
+ 
+@@ -155,32 +155,32 @@ if ((($year,$mm,$dd) = Decode_Date_US2(" January 3rd, 1964 ")) &&
+ $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++;
+ 
+@@ -223,12 +223,12 @@ unless (($year,$mm,$dd) = Decode_Date_US2("_ja331964_"))
+ $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++;
+ 
+diff --git a/t/f028.t b/t/f028.t
+index 8c98c51..96662de 100644
+--- a/t/f028.t
++++ b/t/f028.t
+@@ -41,47 +41,47 @@ if ((($year,$mm,$dd) = Decode_Date_EU2("_00314_")) &&
+ $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++;
+ 
+@@ -116,7 +116,7 @@ if ((($year,$mm,$dd) = Decode_Date_EU2("_0011031964_")) &&
+ $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++;
+ 
+@@ -126,22 +126,22 @@ if ((($year,$mm,$dd) = Decode_Date_EU2("_3_1_1964_")) &&
+ $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++;
+ 
+@@ -156,7 +156,7 @@ if ((($year,$mm,$dd) = Decode_Date_EU2("_3-January-1964_",'')) &&
+ $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++;
+ 
+@@ -166,7 +166,7 @@ if ((($year,$mm,$dd) = Decode_Date_EU2("_000003-Jan-001964_")) &&
+ $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++;
+ 
+@@ -175,22 +175,22 @@ unless (($year,$mm,$dd) = Decode_Date_EU2("_3_j_64_"))
+ $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++;
+ 
+@@ -223,12 +223,12 @@ unless (($year,$mm,$dd) = Decode_Date_EU2("_33ja1964_"))
+ $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++;
+ 
+-- 
+2.1.0
+

diff --git a/perl-Date-Pcalc.spec b/perl-Date-Pcalc.spec
index bad8ab10685baa9fd95e4ee01e9ebc6e1dece40b..38d3cdd93e3c91f90abafa1faa6fe4578f48aba5 100644 (file)
--- a/perl-Date-Pcalc.spec
+++ b/perl-Date-Pcalc.spec
@@ -9,13 +9,14 @@ Summary:      Date::Pcalc Perl module - Gregorian calendar date calculations
 Summary(pl.UTF-8):     Moduł Perla Date::Pcalc - obliczenia na datach wg kalendarza gregoriańskiego
 Name:          perl-Date-Pcalc
 Version:       6.1
-Release:       10
+Release:       11
 # same as perl
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz
 # Source0-md5: 6a719d8fe10ac673be5d09e003130aa8
 Patch0:                build.patch
+Patch1:                Date-Pcalc-6.1-century.patch
 URL:           http://catcode.com/date/pcalc.html
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
@@ -44,9 +45,10 @@ ISO 8601.
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__perl} Makefile.PL \
+echo c | %{__perl} Makefile.PL \
        INSTALLDIRS=vendor
 %{__make} \
        CC="%{__cc}" \