Merge branch rawhide into epel8

.gitignore

@@ -27,15 +27,3 @@
 /kitinerary-21.04.3.tar.xz
 /kitinerary-21.08.2.tar.xz
 /kitinerary-21.08.3.tar.xz
-/kitinerary-21.12.0.tar.xz
-/kitinerary-21.12.1.tar.xz
-/kitinerary-21.12.2.tar.xz
-/kitinerary-21.12.3.tar.xz
-/kitinerary-22.04.0.tar.xz
-/kitinerary-22.04.0.tar.xz
-/kitinerary-22.04.1.tar.xz
-/kitinerary-22.04.1.tar.xz
-/kitinerary-22.04.3.tar.xz
-/kitinerary-22.08.0.tar.xz
-/kitinerary-22.08.1.tar.xz
-/kitinerary-22.08.2.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.spec

@@ -8,7 +8,7 @@
 %endif
 
 Name:    kf5-%{framework}
-Version: 22.08.2
+Version: 21.08.3
 Release: 1%{?dist}
 Summary: A library containing itinerary data model and itinerary extraction code
 
@@ -23,6 +23,8 @@ URL:     https://invent.kde.org/frameworks/%{framework}
 %endif
 Source0:        http://download.kde.org/%{stable}/release-service/%{version}/src/%{framework}-%{version}.tar.xz
 
+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}
@@ -30,7 +32,6 @@ ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
 
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-rpm-macros
-BuildRequires:  qt5-qtbase-private-devel
 
 BuildRequires:  cmake(KF5I18n)
 
@@ -52,8 +53,8 @@ BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Qml)
 
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(poppler)
 %if 0%{?fedora}
+BuildRequires:  pkgconfig(poppler)
 BuildRequires:  libphonenumber-devel
 BuildRequires:  protobuf-devel
 %endif
@@ -122,57 +123,6 @@ make test/fast ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||
 
 
 %changelog
-* Fri Oct 14 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.2-1
-- 22.08.2
-
-* Thu Sep 08 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.1-1
-- 22.08.1
-
-* Fri Aug 19 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.0-1
-- 22.08.0
-
-* Mon Aug 08 2022 Marek Kasik <mkasik@redhat.com> - 22.04.3-5
-- Rebuild for poppler-22.08.0
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 22.04.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jul 18 2022 Than Ngo <than@redhat.com> - 22.04.3-3
-- 22.04.3
-
-* Thu Jul 14 2022 Jan Grulich <jgrulich@redhat.com> - 22.04.1-3
-- Rebuild (qt5)
-
-* Tue May 17 2022 Jan Grulich <jgrulich@redhat.com> - 22.04.1-2
-- Rebuild (qt5)
-
-* Thu May 12 2022 Justin Zobel <justin@1707.io> - 22.04.1-1
-- Update to 22.04.1
-
-* Mon May 09 2022 Justin Zobel <justin@1707.io> - 22.04.0-1
-- Update to 22.04.0
-
-* Fri Mar 11 2022 Jan Grulich <jgrulich@redhat.com> - 21.12.3-2
-- Rebuild (qt5)
-
-* Wed Mar 02 2022 Marc Deop <marcdeop@fedoraproject.org> - 21.12.3-1
-- 21.12.3
-
-* Fri Feb 04 2022 Rex Dieter <rdieter@fedoraproject.org> - 21.12.2-1
-- 21.12.2
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.12.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jan 18 2022 Marek Kasik <mkasik@redhat.com> - 21.12.1-2
-- Rebuild for poppler-22.01.0
-
-* Thu Jan 06 2022 Marc Deop <marcdeop@fedoraproject.org> - 21.12.1-1
-- 21.12.1
-
-* Mon Dec 20 2021 Marc Deop <marcdeop@fedoraproject.org> - 21.12.0-1
-- 21.12.0
-
 * Tue Nov 02 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.08.3-1
 - 21.08.3
 

sources

@@ -1 +1 @@
-SHA512 (kitinerary-22.08.2.tar.xz) = 186d56f7f102d1dc106c718d14c43defff43b65f0e151f072d351425df47b4ce17de6c40e73ee055501161015867d79c971689018f9d7cc0ce49e0d1f47014a2
+SHA512 (kitinerary-21.08.3.tar.xz) = d1fa4fc7d2c5205b396a83b63b21d0d6de578984e8c3d02d18f8e96c88c0ea636b20dc3415e16dd1fb82584fb5591a010c7d774d28544813f6321562f157608d