Merge branch rawhide into epel8

.gitignore

@@ -20,3 +20,10 @@
 /kitinerary-20.08.1.tar.xz
 /kitinerary-20.08.3.tar.xz
 /kitinerary-20.12.2.tar.xz
+/kitinerary-20.12.3.tar.xz
+/kitinerary-21.04.0.tar.xz
+/kitinerary-21.04.1.tar.xz
+/kitinerary-21.04.2.tar.xz
+/kitinerary-21.04.3.tar.xz
+/kitinerary-21.08.2.tar.xz
+/kitinerary-21.08.3.tar.xz

kf5-kitinerary-21.04.3-poppler-21.08.0.patch

@@ -0,0 +1,15 @@
+--- kitinerary-21.04.3/src/lib/pdf/pdfdocument.cpp
++++ kitinerary-21.04.3/src/lib/pdf/pdfdocument.cpp
+@@ -206,7 +206,12 @@ static QDateTime parsePdfDateTime(const
+     int year, month, day, hour, min, sec, tzHours, tzMins;
+     char tz;
+ 
++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
++    GooString dateString(str);
++    if (!parseDateString(&dateString, &year, &month, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) {
++#else
+     if (!parseDateString(str, &year, &month, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) {
++#endif
+         return {};
+     }
+ 

kf5-kitinerary-gcc11.patch

@@ -1,12 +0,0 @@
-diff --git a/src/vdv/vdvcertificate.cpp b/src/vdv/vdvcertificate.cpp
-index 4aa490d..05208ab 100644
---- a/src/vdv/vdvcertificate.cpp
-+++ b/src/vdv/vdvcertificate.cpp
-@@ -4,6 +4,7 @@
-     SPDX-License-Identifier: LGPL-2.0-or-later
- */
- 
-+#include <limits>
- #include "vdvcertificate_p.h"
- #include "vdvdata_p.h"
- #include "iso9796_2decoder_p.h"

kf5-kitinerary.spec

@@ -1,4 +1,3 @@
-%undefine __cmake_in_source_build
 %global framework kitinerary
 
 # uncomment to enable bootstrap mode
@@ -9,7 +8,7 @@
 %endif
 
 Name:    kf5-%{framework}
-Version: 20.12.2
+Version: 21.08.3
 Release: 1%{?dist}
 Summary: A library containing itinerary data model and itinerary extraction code
 
@@ -23,14 +22,14 @@ URL:     https://invent.kde.org/frameworks/%{framework}
 %global stable stable
 %endif
 Source0:        http://download.kde.org/%{stable}/release-service/%{version}/src/%{framework}-%{version}.tar.xz
-Patch0:         %{name}-gcc11.patch
+
+Patch0:         kf5-kitinerary-21.04.3-poppler-21.08.0.patch
 
 # libical (and thus kcalendarcore) not on all arches for RHEL8.
 %if 0%{?rhel} == 8
 ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
 %endif
 
-BuildRequires: make
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-rpm-macros
 
@@ -124,6 +123,36 @@ make test/fast ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||
 
 
 %changelog
+* Tue Nov 02 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.08.3-1
+- 21.08.3
+
+* Thu Oct 21 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.08.2-1
+- 21.08.2
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 21.04.3-3
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Aug 05 2021 Marek Kasik <mkasik@redhat.com> - 21.04.3-2
+- Rebuild for poppler-21.08.0
+
+* Wed Jul 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.3-1
+- 21.04.3
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.04.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 11 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.2-1
+- 21.04.2
+
+* Tue May 11 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.1-1
+- 21.04.1
+
+* Tue Apr 27 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.0-1
+- 21.04.0
+
+* Wed Mar 03 2021 Rex Dieter <rdieter@fedoraproject.org> - 20.12.3-1
+- 20.12.3
+
 * Thu Feb 04 2021 Rex Dieter <rdieter@fedoraproject.org> - 20.12.2-1
 - 20.12.2
 

sources

@@ -1 +1 @@
-SHA512 (kitinerary-20.12.2.tar.xz) = 58b0d3832cb04c024d6e9f41b60d0f7679aaa5aca96c21a6dfca6309d1e1e24f7d5156ee04938b0ac5d5dda463483f96e272abfcb3b6566a9f64238759c1d228
+SHA512 (kitinerary-21.08.3.tar.xz) = d1fa4fc7d2c5205b396a83b63b21d0d6de578984e8c3d02d18f8e96c88c0ea636b20dc3415e16dd1fb82584fb5591a010c7d774d28544813f6321562f157608d