Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package perl-DateTime-Format-Natural for 
openSUSE:Factory checked in at 2022-01-28 22:12:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-DateTime-Format-Natural (Old)
 and      /work/SRC/openSUSE:Factory/.perl-DateTime-Format-Natural.new.1898 
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "perl-DateTime-Format-Natural"

Fri Jan 28 22:12:38 2022 rev:7 rq:949650 version:1.13

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/perl-DateTime-Format-Natural/perl-DateTime-Format-Natural.changes
        2021-03-24 16:13:09.667952148 +0100
+++ 
/work/SRC/openSUSE:Factory/.perl-DateTime-Format-Natural.new.1898/perl-DateTime-Format-Natural.changes
      2022-01-28 22:13:22.986542196 +0100
@@ -1,0 +2,12 @@
+Mon Jan 24 03:06:10 UTC 2022 - Tina M??ller <[email protected]>
+
+- updated to 1.13
+   see /usr/share/doc/packages/perl-DateTime-Format-Natural/Changes
+
+  1.13  2022-01-23  <[email protected]>
+   - Merged development version to stable.
+  1.12_01  2022-01-20  <[email protected]>
+   - Fix demand_future not working for method count_weekday.
+     [github #16 - joernclausen]
+
+-------------------------------------------------------------------

Old:
----
  DateTime-Format-Natural-1.12.tar.gz

New:
----
  DateTime-Format-Natural-1.13.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-DateTime-Format-Natural.spec ++++++
--- /var/tmp/diff_new_pack.AMBRZo/_old  2022-01-28 22:13:23.458538965 +0100
+++ /var/tmp/diff_new_pack.AMBRZo/_new  2022-01-28 22:13:23.462538938 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package perl-DateTime-Format-Natural
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define cpan_name DateTime-Format-Natural
 Name:           perl-DateTime-Format-Natural
-Version:        1.12
+Version:        1.13
 Release:        0
 Summary:        Parse informal natural language date/time strings
 License:        Artistic-1.0 OR GPL-1.0-or-later

++++++ DateTime-Format-Natural-1.12.tar.gz -> 
DateTime-Format-Natural-1.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/DateTime-Format-Natural-1.12/Changes 
new/DateTime-Format-Natural-1.13/Changes
--- old/DateTime-Format-Natural-1.12/Changes    2021-03-19 21:14:02.000000000 
+0100
+++ new/DateTime-Format-Natural-1.13/Changes    2022-01-23 22:07:18.000000000 
+0100
@@ -1,5 +1,14 @@
 Revision history for Perl extension DateTime::Format::Natural.
 
+1.13  2022-01-23  <[email protected]>
+
+ - Merged development version to stable.
+
+1.12_01  2022-01-20  <[email protected]>
+
+ - Fix demand_future not working for method count_weekday.
+   [github #16 - joernclausen]
+
 1.12  2021-03-19  <[email protected]>
 
  - Merged development version to stable.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/DateTime-Format-Natural-1.12/META.json 
new/DateTime-Format-Natural-1.13/META.json
--- old/DateTime-Format-Natural-1.12/META.json  2021-03-19 21:14:02.000000000 
+0100
+++ new/DateTime-Format-Natural-1.13/META.json  2022-01-23 22:07:18.000000000 
+0100
@@ -4,7 +4,7 @@
       "Steven Schubiger <[email protected]>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "Module::Build version 0.4229",
+   "generated_by" : "Module::Build version 0.4231",
    "license" : [
       "perl_5"
    ],
@@ -53,7 +53,7 @@
    "provides" : {
       "DateTime::Format::Natural" : {
          "file" : "lib/DateTime/Format/Natural.pm",
-         "version" : "1.12"
+         "version" : "1.13"
       },
       "DateTime::Format::Natural::Calc" : {
          "file" : "lib/DateTime/Format/Natural/Calc.pm",
@@ -93,7 +93,7 @@
       },
       "DateTime::Format::Natural::Lang::EN" : {
          "file" : "lib/DateTime/Format/Natural/Lang/EN.pm",
-         "version" : "1.69"
+         "version" : "1.70"
       },
       "DateTime::Format::Natural::Rewrite" : {
          "file" : "lib/DateTime/Format/Natural/Rewrite.pm",
@@ -121,6 +121,6 @@
          "url" : "https://github.com/stsc/DateTime-Format-Natural";
       }
    },
-   "version" : "1.12",
-   "x_serialization_backend" : "JSON::PP version 2.97001"
+   "version" : "1.13",
+   "x_serialization_backend" : "JSON::PP version 4.04"
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/DateTime-Format-Natural-1.12/META.yml 
new/DateTime-Format-Natural-1.13/META.yml
--- old/DateTime-Format-Natural-1.12/META.yml   2021-03-19 21:14:02.000000000 
+0100
+++ new/DateTime-Format-Natural-1.13/META.yml   2022-01-23 22:07:18.000000000 
+0100
@@ -13,7 +13,7 @@
 configure_requires:
   Module::Build: '0.42'
 dynamic_config: 1
-generated_by: 'Module::Build version 0.4229, CPAN::Meta::Converter version 
2.150010'
+generated_by: 'Module::Build version 0.4231, CPAN::Meta::Converter version 
2.150010'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -22,7 +22,7 @@
 provides:
   DateTime::Format::Natural:
     file: lib/DateTime/Format/Natural.pm
-    version: '1.12'
+    version: '1.13'
   DateTime::Format::Natural::Calc:
     file: lib/DateTime/Format/Natural/Calc.pm
     version: '1.44'
@@ -52,7 +52,7 @@
     version: '1.08'
   DateTime::Format::Natural::Lang::EN:
     file: lib/DateTime/Format/Natural/Lang/EN.pm
-    version: '1.69'
+    version: '1.70'
   DateTime::Format::Natural::Rewrite:
     file: lib/DateTime/Format/Natural/Rewrite.pm
     version: '0.07'
@@ -83,5 +83,5 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: https://github.com/stsc/DateTime-Format-Natural
-version: '1.12'
+version: '1.13'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/DateTime-Format-Natural-1.12/Makefile.PL 
new/DateTime-Format-Natural-1.13/Makefile.PL
--- old/DateTime-Format-Natural-1.12/Makefile.PL        2021-03-19 
21:14:02.000000000 +0100
+++ new/DateTime-Format-Natural-1.13/Makefile.PL        2022-01-23 
22:07:18.000000000 +0100
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.4229
+# Note: this file was auto-generated by Module::Build::Compat version 0.4231
 use ExtUtils::MakeMaker;
 WriteMakefile
 (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/DateTime-Format-Natural-1.12/README 
new/DateTime-Format-Natural-1.13/README
--- old/DateTime-Format-Natural-1.12/README     2021-03-19 21:14:02.000000000 
+0100
+++ new/DateTime-Format-Natural-1.13/README     2022-01-23 22:07:18.000000000 
+0100
@@ -232,6 +232,7 @@
      Tim Bunce
      Ricardo Signes
      Felix Ostmann
+     J?rn Clausen
 
 SEE ALSO
     dateparse, DateTime, Date::Calc, <http://datetime.perl.org>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/DateTime-Format-Natural-1.12/lib/DateTime/Format/Natural/Lang/EN.pm 
new/DateTime-Format-Natural-1.13/lib/DateTime/Format/Natural/Lang/EN.pm
--- old/DateTime-Format-Natural-1.12/lib/DateTime/Format/Natural/Lang/EN.pm     
2021-03-19 21:14:02.000000000 +0100
+++ new/DateTime-Format-Natural-1.13/lib/DateTime/Format/Natural/Lang/EN.pm     
2022-01-23 22:07:19.000000000 +0100
@@ -13,7 +13,7 @@
 
 use DateTime::Format::Natural::Helpers qw(%flag);
 
-our $VERSION = '1.69';
+our $VERSION = '1.70';
 
 our (%init,
      %timespan,
@@ -2316,7 +2316,10 @@
          ],
          [ {} ],
          [ '_count_weekday' ],
-         { truncate_to => [q(day)] },
+         {
+           advance_future => true,
+           truncate_to    => [q(day)],
+         },
        ],
     ],
     count_yearday => [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/DateTime-Format-Natural-1.12/lib/DateTime/Format/Natural.pm 
new/DateTime-Format-Natural-1.13/lib/DateTime/Format/Natural.pm
--- old/DateTime-Format-Natural-1.12/lib/DateTime/Format/Natural.pm     
2021-03-19 21:14:02.000000000 +0100
+++ new/DateTime-Format-Natural-1.13/lib/DateTime/Format/Natural.pm     
2022-01-23 22:07:18.000000000 +0100
@@ -23,7 +23,7 @@
 
 use DateTime::Format::Natural::Utils qw(trim);
 
-our $VERSION = '1.12';
+our $VERSION = '1.13';
 
 validation_options(
     on_fail => sub
@@ -577,6 +577,8 @@
 
     my $day_of_week = sub { $_[0]->_Day_of_Week(map $_[0]->{datetime}->$_, 
qw(year month day)) };
 
+    my $skip_weekdays = false;
+
     if ((all { /^(?:second|minute|hour)$/ } keys %modified)
         && (exists $self->{modified}{hour} && $self->{modified}{hour} == 1)
         && (($self->{Prefer_future} && $self->{datetime} <  $now)
@@ -584,7 +586,23 @@
     ) {
         $self->{postprocess}{day} = 1;
     }
-    elsif ($token_contains->('weekdays_all')
+    elsif (sub {
+        return false unless @{$self->{tokens}} == 2;
+        my ($day, $weekday) = map $self->{data}->__RE($_), qw(day weekday);
+        if ($self->{tokens}->[0] =~ $day
+         && $self->{tokens}->[1] =~ $weekday) {
+            $skip_weekdays = true;
+            return true;
+        }
+        return false;
+    }->()
+        && (all { /^(?:day|month|year)$/ } keys %modified)
+        && (($self->{Prefer_future} && $self->{datetime}->day <  $now->day)
+         || ($self->{Demand_future} && $self->{datetime}->day <= $now->day))
+    ) {
+        $self->{postprocess}{week} = 4;
+    }
+    elsif (($token_contains->('weekdays_all') && !$skip_weekdays)
         && (exists $self->{modified}{day} && $self->{modified}{day} == 1)
         && (($self->{Prefer_future} && $day_of_week->($self) <  $now->wday)
          || ($self->{Demand_future} && $day_of_week->($self) <= $now->wday))
@@ -924,6 +942,7 @@
  Tim Bunce
  Ricardo Signes
  Felix Ostmann
+ J?rn Clausen
 
 =head1 SEE ALSO
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/DateTime-Format-Natural-1.12/t/06-parse_demand_future.t 
new/DateTime-Format-Natural-1.13/t/06-parse_demand_future.t
--- old/DateTime-Format-Natural-1.12/t/06-parse_demand_future.t 2021-03-19 
21:14:02.000000000 +0100
+++ new/DateTime-Format-Natural-1.13/t/06-parse_demand_future.t 2022-01-23 
22:07:19.000000000 +0100
@@ -47,6 +47,9 @@
 );
 
 my @combined = (
+    { '4th thursday'                   => '21.12.2006 00:00:00'     },
+    { '4th friday'                     => '22.12.2006 00:00:00'     },
+    { '4th saturday'                   => '25.11.2006 00:00:00'     },
     { '4th february'                   => '04.02.2007 00:00:00'     },
     { 'november 3rd'                   => '03.11.2007 00:00:00'     },
     { 'sunday {at} 11:00{sec}'         => '26.11.2006 11:00:{sec}'  },
@@ -74,7 +77,7 @@
     { '12/24' => '24.12.2006 00:00:00' },
 );
 
-_run_tests(172, [ [ \@simple ], [ \@combined ], [ \@formatted ] ], \&compare);
+_run_tests(175, [ [ \@simple ], [ \@combined ], [ \@formatted ] ], \&compare);
 
 sub compare
 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/DateTime-Format-Natural-1.12/t/06-parse_prefer_future.t 
new/DateTime-Format-Natural-1.13/t/06-parse_prefer_future.t
--- old/DateTime-Format-Natural-1.12/t/06-parse_prefer_future.t 2021-03-19 
21:14:02.000000000 +0100
+++ new/DateTime-Format-Natural-1.13/t/06-parse_prefer_future.t 2022-01-23 
22:07:19.000000000 +0100
@@ -47,6 +47,9 @@
 );
 
 my @combined = (
+    { '4th thursday'                   => '21.12.2006 00:00:00'     },
+    { '4th friday'                     => '24.11.2006 00:00:00'     },
+    { '4th saturday'                   => '25.11.2006 00:00:00'     },
     { '4th february'                   => '04.02.2007 00:00:00'     },
     { 'november 3rd'                   => '03.11.2007 00:00:00'     },
     { 'sunday {at} 11:00{sec}'         => '26.11.2006 11:00:{sec}'  },
@@ -74,7 +77,7 @@
     { '12/24' => '24.12.2006 00:00:00' },
 );
 
-_run_tests(172, [ [ \@simple ], [ \@combined ], [ \@formatted ] ], \&compare);
+_run_tests(175, [ [ \@simple ], [ \@combined ], [ \@formatted ] ], \&compare);
 
 sub compare
 {

Reply via email to