diff --git a/applications.keyring b/applications.keyring index 9b6ab5c..2998088 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/kitinerary-23.08.4.tar.xz b/kitinerary-23.08.4.tar.xz deleted file mode 100644 index 5e78636..0000000 --- a/kitinerary-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1340a5c758ffc6b02b5939eaf4ed2fe9cdaeb7e6b3f54486c1ec5e3684d1824 -size 1944284 diff --git a/kitinerary-23.08.4.tar.xz.sig b/kitinerary-23.08.4.tar.xz.sig deleted file mode 100644 index e629de2..0000000 --- a/kitinerary-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8RAACgkQu0YzUNbv -Me/rzA/+OV0jw8HO1OFP/IXwE7KJHwGtjymWcb/tE7dyRYY4t0I+A3TG86hrl69G -YxchfvjfWojUx/ILnz1/zIABdf7RvmyvXhda9dS0v8nxM8hymMlyzT9uLbNX13y6 -Z8Q8ma8w5qn9+q9JXGy91nW4hQ0eKQuOVkDtMfy3nORccT9HOI+4UPpMxlL02JUi -Aelh+ZLoRDfFLvA482fsEMGwPbQ7iOF+OvSc0x+iWGBoxUbCaPmhDhs0tUJSTfHB -uO49uw3UXYVXWoRpC9tR0nF5hygVCMXeirz0PvrVbXor5N8+OmoZ22fEVjH8U2Er -CLomxaib4tri+OsvCWBqMm5OoWuTsNi5c8LlDRuklJuIwlF4IM4NmzaV7kHPLT4e -WcZMrQ+Oq21Ff9lYhCTQXiHjUQe/ud/aK1kyLQkJeZeteNp370HBDNYhAwiD/U+b -vZ0EoMPx4JPw3A/DyQVZba+1+tq8eSqCh9eb7oui6lenClJ4JVXN3fb8QR1Fyije -mP65oir5FXmbxz4VueiQbRMIRPgHTPn5OuHNKhBY9sn9/O+DM0Rszp9LkciZ+qFd -hxzMCdoWUblYB1G6l4dLRlwrZo4RnW8S+2oa+9ByOKzzbaWELlewuXBaJ2m7kNC4 -eUSkVne96oS0xummC3nf35fB0Vkh4ZO+AyiVXvXQQMzTgXWxAEY= -=f6rX ------END PGP SIGNATURE----- diff --git a/kitinerary-24.02.0.tar.xz b/kitinerary-24.02.0.tar.xz new file mode 100644 index 0000000..e123f02 --- /dev/null +++ b/kitinerary-24.02.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e18c62363607dd769092e9e15fce3e00250d706f78d1c7d8ad2835bc620d977a +size 1960048 diff --git a/kitinerary-24.02.0.tar.xz.sig b/kitinerary-24.02.0.tar.xz.sig new file mode 100644 index 0000000..6b1710a --- /dev/null +++ b/kitinerary-24.02.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVrnAACgkQu0YzUNbv +Me8Bag//e+3hqAp42cLYTTq+IFhOjFU+RvTYxIfqD+MX+zuKeTrtlH4ODHPnQdF9 +KjUjFs7UQWIzWfdKHfYy/SbW0TQPTX6H3ihKc++wjdpX4nhQ3rjGCmV4lPWek6dw +QL3Z+/az+g7IxUFxvxOFZ8sy0entR2IOJv8RPRR33Ii/1XwhpIKRs8JK/DQlyB44 +fYzVDowuyloXZDofCvnuh5Ts+LsvEhezgMqOSk6dLtpG1Zyov8mIN+9PVTy6vhGe +Ag+xm43h2n+iRCcGX40rBTSjkd3B3mI5mrXX/FAo19XrGF9Ru5Z8xveBJGa1VGSp +kzX89M/X1XXbWtR4qDRfdGGkFQPh72or9EJpb2C7/WL4wHjcSz7eiM9ABp5N7Z82 +E9qTNIXaEkZ3iYOWFOxDJLZWSDKBLRGlnQr5ahY9dIchx1oXTTu+qrT0zlI0HGc7 +mv8dnKJ3Ybqol1LI6qe0KxCACl4K4wR8lpUNJSpQl2CTjEJrO6H0U9a09/Aykkq8 +89STnRelZ8L9+xWDboBl9wDdX/JvY6rUSuKMNJM0Vs66XFO73ucLnn+7DXxnNAx1 +CUTOZwbrXoba7M0OSXkvOhw0g09gKGiS/68Rh3+Q3RNBY5XByxbpDGOFx8O0rx0s +FGl4gSDryV5HeontOPi/W7HuEIXfcRTfkCa0Vt8r7C8klFQyEbw= +=Oakz +-----END PGP SIGNATURE----- diff --git a/kitinerary.changes b/kitinerary.changes index ff4fa71..820d185 100644 --- a/kitinerary.changes +++ b/kitinerary.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Feb 23 13:59:31 UTC 2024 - Christophe Marin + +- Update to 24.02.0 + * New feature release +- Changes since 24.01.95: + * Handle another DB regional ERA TLB ticket variant with PLAI layout + * Handle time quadruples in the generic boarding pass extractor (kde#481281) + * Support the horizontally split double ticket layout for PV/Vivi + * Extract seat information from Elron tickets + * Make LTG Link extractor more robust against slight layout variations + * Force-disable unity builds + * Handle Carte Advantage with multiple validity periods + * Don't set reservationNumber for Thalys ERA SSB barcodes to TCN + +------------------------------------------------------------------- +Fri Feb 9 16:08:37 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:44 UTC 2023 - Christophe Marin diff --git a/kitinerary.spec b/kitinerary.spec index d6d6250..99c8c3b 100644 --- a/kitinerary.spec +++ b/kitinerary.spec @@ -1,7 +1,7 @@ # # spec file for package kitinerary # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,113 +16,106 @@ # -%define libname libKPimItinerary5 +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 +%define kpim6_version 6.0.0 + %bcond_without released Name: kitinerary -Version: 23.08.4 +Version: 24.02.0 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: extra-cmake-modules -BuildRequires: kf5-filesystem -%if 0%{?suse_version} == 1500 -BuildRequires: gcc10-c++ -BuildRequires: gcc10-PIE -%endif -BuildRequires: libopenssl-devel +BuildRequires: doxygen +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: libphonenumber-devel -BuildRequires: libpoppler-qt5-devel -BuildRequires: libqt5-qtdeclarative-private-headers-devel -BuildRequires: libxml2-devel -BuildRequires: zlib-devel -BuildRequires: cmake(KF5CalendarCore) -BuildRequires: cmake(KF5Contacts) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5Mime) -BuildRequires: cmake(KPim5PkPass) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5Test) +BuildRequires: pkgconfig +BuildRequires: shared-mime-info +BuildRequires: cmake(KF6CalendarCore) >= %{kf6_version} +BuildRequires: cmake(KF6Contacts) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KPim6Mime) >= %{kpim6_version} +BuildRequires: cmake(KPim6PkPass) >= %{kpim6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6ToolsTools) >= %{qt6_version} BuildRequires: cmake(ZXing) -%requires_eq libKPim5Itinerary5 -Conflicts: libKPimItinerary5 < %{version} +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(poppler-qt6) +BuildRequires: pkgconfig(zlib) +Requires: libKPim6Itinerary6 = %{version} %description -Kitinerary is a library which provides a data model and a system to extract information -from travel reservations. The model can then be reused in other applications. +Kitinerary is a library which provides a data model and a system to extract +information from travel reservations. The model can then be reused in other +applications. -%package -n libKPim5Itinerary5 +%package -n libKPim6Itinerary6 Summary: Data model and extraction system for travel reservations -%requires_eq %{name} -# Renamed -Obsoletes: libKPimItinerary5-lang +Requires: kitinerary >= %{version} +Obsoletes: libKPim5Itinerary5-lang < %{version} -%description -n libKPim5Itinerary5 -Kitinerary is a library which provides a data model and a system to extract information -from travel reservations. The model can then be reused in other applications. -This package contains the library itself. +%description -n libKPim6Itinerary6 +Kitinerary is a library which provides a data model and a system to extract +information from travel reservations. The model can then be reused in other +applications. +This package contains the kitinerary library. %package devel Summary: Development files for kitinerary -Requires: libKPim5Itinerary5 = %{version} -Requires: libqt5-qtdeclarative-private-headers-devel -Requires: cmake(KF5CalendarCore) -Requires: cmake(KF5Contacts) -Requires: cmake(KF5Mime) -Requires: cmake(KPim5PkPass) -Requires: cmake(Qt5Gui) +Requires: libKPim6Itinerary6 = %{version} +Requires: cmake(KF6CalendarCore) >= %{kf6_version} +Requires: cmake(KF6Contacts) >= %{kf6_version} +Requires: cmake(KPim6Mime) >= %{kpim6_version} +Requires: cmake(KPim6PkPass) >= %{kpim6_version} +Requires: cmake(Qt6Gui) >= %{qt6_version} %description devel This package contains all necessary include files and libraries needed to build programs that use the kitinerary library. -%lang_package -n libKPim5Itinerary5 +%lang_package -n libKPim6Itinerary6 %prep %autosetup -p1 %build -%if 0%{?suse_version} == 1500 -export CXX=g++-10 -%endif -%cmake_kf5 -d build -- -DBUILD_TESTING=OFF -%cmake_build +%cmake_kf6 -DBUILD_QCH:BOOL=TRUE + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --with-qt --all-name +%find_lang %{name} --all-name -#%check -#%ctest - -%ldconfig_scriptlets -n libKPim5Itinerary5 +%ldconfig_scriptlets -n libKPim6Itinerary6 %files -%license LICENSES/* -%{_kf5_debugdir}/*.categories -%{_kf5_libexecdir}/kitinerary-extractor -%{_kf5_sharedir}/mime/packages/application-vnd-kde-itinerary.xml +%{_kf6_debugdir}/org_kde_kitinerary.categories +%{_kf6_libexecdir}/kitinerary-extractor +%{_kf6_sharedir}/mime/packages/application-vnd-kde-itinerary.xml -%files -n libKPim5Itinerary5 -%{_kf5_libdir}/libKPim5Itinerary.so.* +%files -n libKPim6Itinerary6 +%license LICENSES/* +%{_kf6_libdir}/libKPim6Itinerary.so.* %files devel -%dir %{_includedir}/KPim5/ -%{_includedir}/KPim5/KItinerary/ -%{_includedir}/KPim5/kitinerary/ -%{_includedir}/KPim5/kitinerary_version.h -%{_kf5_cmakedir}/KPimItinerary/ -%{_kf5_cmakedir}/KPim5Itinerary/ -%{_kf5_libdir}/libKPim5Itinerary.so +%doc %{_kf6_qchdir}/KPim6Itinerary.* +%{_includedir}/KPim6/KItinerary/ +%{_includedir}/KPim6/kitinerary/ +%{_includedir}/KPim6/kitinerary_version.h +%{_kf6_cmakedir}/KPim6Itinerary/ +%{_kf6_libdir}/libKPim6Itinerary.so -%files -n libKPim5Itinerary5-lang -f %{name}.lang +%files -n libKPim6Itinerary6-lang -f %{name}.lang %changelog