Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kopeninghours for openSUSE:Factory checked in at 2023-08-31 13:44:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopeninghours (Old) and /work/SRC/openSUSE:Factory/.kopeninghours.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopeninghours" Thu Aug 31 13:44:53 2023 rev:29 rq:1105746 version:23.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kopeninghours/kopeninghours.changes 2023-07-07 15:51:30.597693438 +0200 +++ /work/SRC/openSUSE:Factory/.kopeninghours.new.1766/kopeninghours.changes 2023-08-31 13:49:24.584140390 +0200 @@ -1,0 +2,26 @@ +Sun Aug 20 13:59:53 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.08.0/ +- No code change since 23.07.90 + +------------------------------------------------------------------- +Mon Aug 14 08:03:10 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.90 + * New feature release +- No code change since 23.07.80 + +------------------------------------------------------------------- +Tue Aug 1 10:14:08 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.80 + * New feature release +- Changes since 23.04.3: + * Repeat year and month, when both are specified + * Explicitly set target interface include directories + * Provide valid closed intervals for always closed expressions + +------------------------------------------------------------------- Old: ---- kopeninghours-23.04.3.tar.xz kopeninghours-23.04.3.tar.xz.sig New: ---- kopeninghours-23.08.0.tar.xz kopeninghours-23.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopeninghours.spec ++++++ --- /var/tmp/diff_new_pack.EYDwEL/_old 2023-08-31 13:49:26.172197151 +0200 +++ /var/tmp/diff_new_pack.EYDwEL/_new 2023-08-31 13:49:26.232199296 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: kopeninghours -Version: 23.04.3 +Version: 23.08.0 Release: 0 Summary: OSM opening hours expression parser and evaluator License: LGPL-2.0-or-later @@ -32,7 +32,7 @@ BuildRequires: flex BuildRequires: cmake(KF5Holidays) BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(Qt5Core) >= 5.14 +BuildRequires: cmake(Qt5Core) >= 5.15.2 BuildRequires: cmake(Qt5Qml) BuildRequires: cmake(Qt5Test) ++++++ kopeninghours-23.04.3.tar.xz -> kopeninghours-23.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-23.04.3/CMakeLists.txt new/kopeninghours-23.08.0/CMakeLists.txt --- old/kopeninghours-23.04.3/CMakeLists.txt 2023-07-04 07:01:56.000000000 +0200 +++ new/kopeninghours-23.08.0/CMakeLists.txt 2023-08-16 22:25:59.000000000 +0200 @@ -5,8 +5,8 @@ # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "23") -set (RELEASE_SERVICE_VERSION_MINOR "04") -set (RELEASE_SERVICE_VERSION_MICRO "3") +set (RELEASE_SERVICE_VERSION_MINOR "08") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(KOpeningHours VERSION ${RELEASE_SERVICE_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-23.04.3/autotests/parsertest.cpp new/kopeninghours-23.08.0/autotests/parsertest.cpp --- old/kopeninghours-23.04.3/autotests/parsertest.cpp 2023-07-04 07:01:56.000000000 +0200 +++ new/kopeninghours-23.08.0/autotests/parsertest.cpp 2023-08-16 22:25:59.000000000 +0200 @@ -20,6 +20,7 @@ QTest::addColumn<QByteArray>("expectedOutput"); QTest::addColumn<QByteArray>("expectedSimplifiedOutput"); + // clang-format off #define T(x) QTest::newRow(x) << QByteArray(x) << QByteArray(x) << QByteArray(x) #define T2(x, y) QTest::newRow(x) << QByteArray(x) << QByteArray(y) << QByteArray(y) #define T3(x, y, z) QTest::newRow(x) << QByteArray(x) << QByteArray(y ? y : x) << QByteArray(z) @@ -31,13 +32,23 @@ T("off"); T("Dec off"); T("Dec 25 off"); + + // Don't repeat the month when it's the same (#446224) T("Dec 25-26 off"); T("Dec 24-26,31 off"); T2("Jan 1,6 off", "Jan 01,06 off"); T("Dec 24,25,26"); - T2("Jan 03,Dec 04,24 off", "Jan 03,Dec 04,24 off"); + T("Jan 03,Dec 04,24 off"); T2("Jan 03, Dec 04, 24 off", "Jan 03,Dec 04,24 off"); T2("07:30-20:00; Jan 03,13,23,Dec 04,14,24 off", "07:30-20:00; Jan 03,13,23,Dec 04,14,24 off"); + + // But do repeat the year and the month, when a year is specified + T2("2023 Apr 26,28 08:00-09:00; PH off", "2023 Apr 26,2023 Apr 28 08:00-09:00; PH off"); // input was incorrect, the year and month must be repeated + T2("2021 Dec 26-28,30-31,2022 Jan 02-03 off", "2021 Dec 26-28,2021 Dec 30-31,2022 Jan 02-03 off"); + T2("2021 Dec 22, 26-28, 29, 31, 2022 Jan 02-03 off", "2021 Dec 22,2021 Dec 26-28,2021 Dec 29,2021 Dec 31,2022 Jan 02-03 off"); + T("2021 Dec 26-28, Dec 30-31,2022 Jan 02-03 off"); // note that this means Dec 30-31 every year, not just in 2021 (says https://openingh.openstreetmap.de/evaluation_tool/) + T("2023 Apr 26, Apr 28 09:00-10:00; PH off"); // note that this means Apr 28 every year, not just in 2023 (says https://openingh.openstreetmap.de/evaluation_tool/) + T("Dec 08:00"); T("Dec 08:00-14:00"); T("easter off"); @@ -188,8 +199,8 @@ // from https://github.com/dfaure/DataNovaImportScripts/blob/master/saved_opening_hours T3("Mo-Tu,Th-Fr 09:30-12:00; 2020 Dec 28 off; 2020 Dec 22,2020 Dec 29 off; We 15:00-17:00; 2020 Dec 23,2020 Dec 30 off; 2020 Dec 24,2020 Dec 31 off; Sa 10:00-12:00; 2020 Dec 26,2021 Jan 02 off; PH off", - "Mo-Tu,Th-Fr 09:30-12:00; 2020 Dec 28 off; 2020 Dec 22,29 off; We 15:00-17:00; 2020 Dec 23,30 off; 2020 Dec 24,31 off; Sa 10:00-12:00; 2020 Dec 26,2021 Jan 02 off; PH off", - "Mo,Tu,Th,Fr 09:30-12:00; 2020 Dec 28 off; 2020 Dec 22,29 off; We 15:00-17:00; 2020 Dec 23,30 off; 2020 Dec 24,31 off; Sa 10:00-12:00; 2020 Dec 26,2021 Jan 02 off; PH off"); + "Mo-Tu,Th-Fr 09:30-12:00; 2020 Dec 28 off; 2020 Dec 22,2020 Dec 29 off; We 15:00-17:00; 2020 Dec 23,2020 Dec 30 off; 2020 Dec 24,2020 Dec 31 off; Sa 10:00-12:00; 2020 Dec 26,2021 Jan 02 off; PH off", + "Mo,Tu,Th,Fr 09:30-12:00; 2020 Dec 28 off; 2020 Dec 22,2020 Dec 29 off; We 15:00-17:00; 2020 Dec 23,2020 Dec 30 off; 2020 Dec 24,2020 Dec 31 off; Sa 10:00-12:00; 2020 Dec 26,2021 Jan 02 off; PH off"); // real-world tests from Osmose that we were handling wrongly T("Tu-Fr 11:30-14:30 open, 14:30-18:00 open \"pickup only\", 18:00-22:00 open"); @@ -215,11 +226,6 @@ T2("Mo, We, Fr 06:30-21:30; Tu, Th 09:00-21:30; Sa 09:00-17:00; Su 09:00-14:00", "Mo,We,Fr 06:30-21:30; Tu,Th 09:00-21:30; Sa 09:00-17:00; Su 09:00-14:00"); T2("Lunes a sábado, 9:30 AM-5:30 PM", "Mo-Sa 09:30-17:30"); // bug 445784 - // lists of specific days - T("2021 Dec 26-28,30-31,2022 Jan 02-03 off"); - T2("2021 Dec 26-28,Dec 30-31,2022 Jan 02-03 off", "2021 Dec 26-28,30-31,2022 Jan 02-03 off"); - T2("2021 Dec 22, 26-28, 29, 31, 2022 Jan 02-03 off", "2021 Dec 22,26-28,29,31,2022 Jan 02-03 off"); - // technically wrong but often found content in OSM for which we have error recovery T2("So", "Su"); T2("Ph", "PH"); @@ -396,6 +402,7 @@ #undef T #undef T2 #undef T3 + // clang-format on } void testSuccess() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-23.04.3/po/zh_CN/kopeninghours.po new/kopeninghours-23.08.0/po/zh_CN/kopeninghours.po --- old/kopeninghours-23.04.3/po/zh_CN/kopeninghours.po 2023-07-04 07:01:56.000000000 +0200 +++ new/kopeninghours-23.08.0/po/zh_CN/kopeninghours.po 2023-08-16 22:25:59.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-12-23 02:25+0100\n" -"PO-Revision-Date: 2023-07-03 11:41\n" +"PO-Revision-Date: 2023-08-02 12:45\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-23.04.3/setup.py new/kopeninghours-23.08.0/setup.py --- old/kopeninghours-23.04.3/setup.py 2023-07-04 07:01:56.000000000 +0200 +++ new/kopeninghours-23.08.0/setup.py 2023-08-16 22:25:59.000000000 +0200 @@ -5,7 +5,7 @@ setup( name="PyKOpeningHours", - version="1.4.0", + version="1.5.0", description="Validator for OSM opening_hours expressions", author='David Faure', license="AGPL", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-23.04.3/src/lib/CMakeLists.txt new/kopeninghours-23.08.0/src/lib/CMakeLists.txt --- old/kopeninghours-23.04.3/src/lib/CMakeLists.txt 2023-07-04 07:01:56.000000000 +0200 +++ new/kopeninghours-23.08.0/src/lib/CMakeLists.txt 2023-08-16 22:25:59.000000000 +0200 @@ -55,6 +55,7 @@ PUBLIC Qt::Core ) +target_include_directories(KOpeningHours INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}>") if (VALIDATOR_ONLY) target_compile_definitions(KOpeningHours PUBLIC KOPENINGHOURS_VALIDATOR_ONLY) else() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-23.04.3/src/lib/selectors.cpp new/kopeninghours-23.08.0/src/lib/selectors.cpp --- old/kopeninghours-23.04.3/src/lib/selectors.cpp 2023-07-04 07:01:56.000000000 +0200 +++ new/kopeninghours-23.08.0/src/lib/selectors.cpp 2023-08-16 22:25:59.000000000 +0200 @@ -348,7 +348,7 @@ }; switch (variableDate) { case FixedDate: { - const bool needYear = year && year != refDate.year && year != prev.begin.year && year != prev.end.year; + const bool needYear = year && year != refDate.year; if (needYear) { expr += QByteArray::number(year); }
