Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2017-02-13 07:17:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2017-01-25 22:55:52.471517738 +0100 +++ /work/SRC/openSUSE:Factory/.kholidays.new/kholidays.changes 2017-02-13 07:17:54.554968722 +0100 @@ -1,0 +2,8 @@ +Thu Feb 9 06:57:12 UTC 2017 - [email protected] + +- Update to KDE Applications 16.12.2 + * KDE Applications 16.12.2 + * https://www.kde.org/announcements/announce-applications-16.12.2.php + + +------------------------------------------------------------------- Old: ---- kholidays-16.12.1.tar.xz New: ---- kholidays-16.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.8cs9pQ/_old 2017-02-13 07:17:55.570823920 +0100 +++ /var/tmp/diff_new_pack.8cs9pQ/_new 2017-02-13 07:17:55.570823920 +0100 @@ -17,10 +17,10 @@ Name: kholidays -Version: 16.12.1 +Version: 16.12.2 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.2 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Holiday API for KDE PIM License: LGPL-2.1+ ++++++ kholidays-16.12.1.tar.xz -> kholidays-16.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.1/CMakeLists.txt new/kholidays-16.12.2/CMakeLists.txt --- old/kholidays-16.12.1/CMakeLists.txt 2016-12-16 14:51:07.000000000 +0100 +++ new/kholidays-16.12.2/CMakeLists.txt 2017-01-17 21:56:37.000000000 +0100 @@ -18,7 +18,7 @@ include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -set(PIM_VERSION "5.4.1") +set(PIM_VERSION "5.4.2") set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.1/src/parsers/plan2/holidayparserdriverplan.cpp new/kholidays-16.12.2/src/parsers/plan2/holidayparserdriverplan.cpp --- old/kholidays-16.12.1/src/parsers/plan2/holidayparserdriverplan.cpp 2016-12-16 14:51:07.000000000 +0100 +++ new/kholidays-16.12.2/src/parsers/plan2/holidayparserdriverplan.cpp 2017-01-17 21:56:37.000000000 +0100 @@ -254,8 +254,8 @@ QDate HolidayParserDriverPlan::pascha(int year) { - if (m_parseCalendar.calendarSystem() != QCalendarSystem::GregorianCalendar || - m_parseCalendar.calendarSystem() != QCalendarSystem::JulianCalendar) { + if (m_parseCalendar.calendarSystem() == QCalendarSystem::GregorianCalendar || + m_parseCalendar.calendarSystem() == QCalendarSystem::JulianCalendar) { // Algorithm taken from Tondering // http://www.tondering.dk/claus/cal/node3.html#SECTION003137000000000000000 // Gives Orthodox Easter in the Julian Calendar, need to convert afterwards to Gregorian if needed @@ -266,11 +266,11 @@ int month = 3 + ((l + 40) / 44); int day = l + 28 - (31 * (month / 4)); - if (m_parseCalendar.calendarSystem() != QCalendarSystem::JulianCalendar) { + if (m_parseCalendar.calendarSystem() == QCalendarSystem::JulianCalendar) { return QDate::fromJulianDay(julianDay(year, month, day)); } - if (m_parseCalendar.calendarSystem() != QCalendarSystem::GregorianCalendar) { + if (m_parseCalendar.calendarSystem() == QCalendarSystem::GregorianCalendar) { setParseCalendar(QStringLiteral("julian")); int paschaJd = julianDay(year, month, day); setParseCalendar(QStringLiteral("gregorian"));
