diff --git a/0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch b/0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch deleted file mode 100644 index c5e98a0..0000000 --- a/0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0ef772c3e0ff8f049f299ad14b3c65327e4fe69e Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 11 Dec 2022 13:29:11 +0000 -Subject: [PATCH] asn1: Fix build with GCC 13 (add missing include) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so is no longer transitively included. - -Explicitly include for uint8_t. - -Bug: https://bugs.gentoo.org/885423 ---- - src/lib/asn1/bitvectorview.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/asn1/bitvectorview.h b/src/lib/asn1/bitvectorview.h -index 5a4da315..f924a1fe 100644 ---- a/src/lib/asn1/bitvectorview.h -+++ b/src/lib/asn1/bitvectorview.h -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - #include - --- -2.39.2 - diff --git a/kitinerary-22.12.3.tar.xz b/kitinerary-22.12.3.tar.xz deleted file mode 100644 index a10050a..0000000 --- a/kitinerary-22.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a697a4133575b39e444693c6035af19fc77293322463a3db53543f975c862e63 -size 1724024 diff --git a/kitinerary-22.12.3.tar.xz.sig b/kitinerary-22.12.3.tar.xz.sig deleted file mode 100644 index 9d33c1a..0000000 --- a/kitinerary-22.12.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmP9SJ8ACgkQu0YzUNbv -Me+jbw//XfM19oTM5FDu+A568A09lLra1QgiSitHxBS9yLwx167s354Wim6fJA+B -8Jh3Q3IAp/97JicYQ4OyGQ8kMm/ChWpKowDRiRsBr0VQMCwkK46XcbFFV2NMLJt3 -ktegjQF27vDljFBr4AzAwPZcuxIhiE6FMT8lc991gKDThD2yGFtCjpeoLSYrhpxS -eSGqkRirAac/xAtV0ySrRHIXRO34LDOmiQ2gS0fj9QlF2joMOAEjmQs8pEj9VTT8 -/JQXQ+50nqTKMOKYTWxp+JUPmz0kiy+oP1+TrGYZo7BL2wSN8iZjzHFmmz16oLrm -5ymJ/7fiZGN2oGklCA9wj/JXEa2m4vnE2HmmxB7jBqLD9QJoajJsfcoNHiTNd7WI -Txs/IGHk0EERDEGdtxvWLu8LuARjpN+QY9V5l51NoUkYuEkFy59ZHgDhHemVtEND -741Jpps1Nj+Pvh0InwF8T+JwG8G7KMgkNZ/yqnv1KPHkBo4neAKv8iSEK/x6f9+M -RqF4HdMRrpgOwcUDaJcCe5NNaqxdoiHt/RekGCydHdk884TihyzYTlXaRLg99sHW -ReuNvSTyLSN6lsDOIWKqujUmoxhsbPwW7FCkWd9F8NKAf1DXgLkgeXAx5qkmRv/r -renO5sHqjRPjdhyffA8RSGDNnK2wxRbjpIXQ4pEljmmEbDMk+ns= -=/2/d ------END PGP SIGNATURE----- diff --git a/kitinerary-23.04.0.tar.xz b/kitinerary-23.04.0.tar.xz new file mode 100644 index 0000000..0039e85 --- /dev/null +++ b/kitinerary-23.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba798446958b5591cd4ecc260105ccd8399a540e3de550fbf788974c7011ab1f +size 1748016 diff --git a/kitinerary-23.04.0.tar.xz.sig b/kitinerary-23.04.0.tar.xz.sig new file mode 100644 index 0000000..38255f0 --- /dev/null +++ b/kitinerary-23.04.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmQ48EEACgkQu0YzUNbv +Me9qWQ/8Cidmcg2Iu+ZaVOgAtkXhjWJqJsMvc+lxpGsQiKkpDxuc8MM03+WJTIsU +/HAuuKy7bSIi+zEhmwRrKigyF5UPbPfWeTQCFjt/rb/g64qOCpz5elwEmdX9SzGH +92b67NbIFPJqyDW5r69kAkEOGzkl6xGzE6F2LlPJ6QWoSyzexIuFJWIeFi+Xo7bn +aLauI9f8FipGc4gAR78i0vItUiI/gKhnQIB2zZG54Ck/RhaPbu1IuuA6JEzj3BcL +VNQwlpfEdp5EWAsNqKijsiCwjEAFkUfQvWXt6MJ+QT3jMJZsH/Yc1e10p8H/58n/ +LrDiYqh/SahZzLcMzZnaigiA4Zmz95msUGESUnEulnaZCLnmXEteROtg6luvbCJd +kju7WSkmZQgqf056gnpr5eeB/1uQ0VMcBfWcrHJxW4G7JFKJc+GklF/gQ+yG56WF +yXn9XBbktzgIG86zFlOAtrf9Uw7PhCoIRBG2du+CS3J22kWifIDvaqHUTzqSlUyk +bEeO4uatotaRgAgHGlHl8/nKH2/gXGYcuYACjDmCnFntJyORfxrKwyzVzfdZOM0U +nK75maRwMPfOwafjf2xo//nOEeHZIXydwnI38WXMdhtDWr9XZ2d7OED7KstAS3r+ +vjurFO45G2KO4W84zpXx4pfsG8uWjZMREhLIef34hx0R5fZkvs4= +=4HyZ +-----END PGP SIGNATURE----- diff --git a/kitinerary.changes b/kitinerary.changes index c9146c9..81a1394 100644 --- a/kitinerary.changes +++ b/kitinerary.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Apr 15 08:45:54 UTC 2023 - Christophe Marin + +- Update to 23.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.04.0/ + +------------------------------------------------------------------- +Fri Mar 31 16:42:06 UTC 2023 - Christophe Marin + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:43:39 UTC 2023 - Christophe Marin + +- Update to 23.03.80 + * New feature release +- Drop patch, merged upstream: + * 0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch + ------------------------------------------------------------------- Tue Feb 28 09:46:08 UTC 2023 - Christophe Marin diff --git a/kitinerary.spec b/kitinerary.spec index e22def2..019fe8d 100644 --- a/kitinerary.spec +++ b/kitinerary.spec @@ -16,9 +16,10 @@ # +%define libname libKPimItinerary5 %bcond_without released Name: kitinerary -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later @@ -28,8 +29,6 @@ Source: https://download.kde.org/stable/release-service/%{version}/src/% Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -# PATCH-FIX-UPSTREAM -Patch0: 0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem %if 0%{?suse_version} == 1500 @@ -46,42 +45,44 @@ BuildRequires: cmake(KF5CalendarCore) BuildRequires: cmake(KF5Contacts) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5Mime) -BuildRequires: cmake(KPimPkPass) +BuildRequires: cmake(KPim5PkPass) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Qml) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(ZXing) -Requires: libKPimItinerary5 = %{version} +%requires_eq libKPim5Itinerary5 +Conflicts: libKPimItinerary5 < %{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. -%package -n libKPimItinerary5 +%package -n libKPim5Itinerary5 Summary: Data model and extraction system for travel reservations -Recommends: %{name} -Recommends: libKPimItinerary5-lang +%requires_eq %{name} +# Renamed +Obsoletes: libKPimItinerary5-lang -%description -n libKPimItinerary5 +%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. %package devel Summary: Development files for kitinerary -Requires: libKPimItinerary5 = %{version} +Requires: libKPim5Itinerary5 = %{version} Requires: libqt5-qtdeclarative-private-headers-devel Requires: cmake(KF5CalendarCore) Requires: cmake(KF5Contacts) Requires: cmake(KF5Mime) -Requires: cmake(KPimPkPass) +Requires: cmake(KPim5PkPass) Requires: cmake(Qt5Gui) %description devel This package contains all necessary include files and libraries needed to build programs that use the kitinerary library. -%lang_package -n libKPimItinerary5 +%lang_package -n libKPim5Itinerary5 %prep %autosetup -p1 @@ -102,25 +103,26 @@ export CXX=g++-10 %check %ctest -%ldconfig_scriptlets -n libKPimItinerary5 +%ldconfig_scriptlets -n libKPim5Itinerary5 %files +%license LICENSES/* +%{_kf5_debugdir}/*.categories %{_kf5_libexecdir}/kitinerary-extractor %{_kf5_sharedir}/mime/packages/application-vnd-kde-itinerary.xml -%files -n libKPimItinerary5 -%license LICENSES/* -%{_kf5_debugdir}/*.categories -%{_kf5_libdir}/libKPimItinerary.so.* +%files -n libKPim5Itinerary5 +%{_kf5_libdir}/libKPim5Itinerary.so.* %files devel -%dir %{_includedir}/KPim/ -%{_includedir}/KPim/KItinerary/ -%{_includedir}/KPim/kitinerary/ -%{_includedir}/KPim/kitinerary_version.h +%dir %{_includedir}/KPim5/ +%{_includedir}/KPim5/KItinerary/ +%{_includedir}/KPim5/kitinerary/ +%{_includedir}/KPim5/kitinerary_version.h %{_kf5_cmakedir}/KPimItinerary/ -%{_kf5_libdir}/libKPimItinerary.so +%{_kf5_cmakedir}/KPim5Itinerary/ +%{_kf5_libdir}/libKPim5Itinerary.so -%files -n libKPimItinerary5-lang -f %{name}.lang +%files -n libKPim5Itinerary5-lang -f %{name}.lang %changelog