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/kpublictransport-23.08.4.tar.xz b/kpublictransport-23.08.4.tar.xz deleted file mode 100644 index 50e629b..0000000 --- a/kpublictransport-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8123bfa9282ee64afaacd848e092c60b29b487ad8ce6f72e8d9f90fea626149d -size 571292 diff --git a/kpublictransport-23.08.4.tar.xz.sig b/kpublictransport-23.08.4.tar.xz.sig deleted file mode 100644 index 9aa67c7..0000000 --- a/kpublictransport-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8UgACgkQu0YzUNbv -Me8zCQ/9FnCyCBD1C7NuN46qXEINNUnpPaDEX0OLgEvqCx11uAGEkblZHrl8YM6c -YGR3Gv00lh49FgTSkvy0Ak+zNw2Rjshnj4veEMLnATDvXdpIrppgiTr259EROhwD -yb1kMIReZdzZ8b8l/mdL+olPIfQpD8asb210nMcq8OpKbpGke3aXl+5xA0cJ+WjN -xysTT8LKsSx43B3HvkDIyPk/nOsvCkOVTox9bOYUpvlD7U2213RerwZ4MrUKb/3F -1rjpoccKl8g19f+ilsI0jvnNfbMgdILw4KKazJAi59fwgMcgOoopK+UervCB6LZY -Lj02K+Q3A9Qur9OHirpZb8lBK2s5Uyn38zIA0MqsEX1oQhPV2gG+9m9JvVaHtj06 -va4sShZBTaxbZUXuw9wFYzj1pQBOzHoTn8LGrMlkVRT4JuOEnOEj2SQstWInbiWI -vt/RQl2hJw1k8PyZ2ukrbwP5gs+E1R3gKE8MdwlRmL9ulX29P9mfhIG5l+I8qP8y -9/BlYwDl2kPJpkmv8LY/23C3WS9q4wouNVwB1SUy0RDqn4qMYnYMI0ky4YZKvsjb -Csh/TvWHM0EW+H+/q1zrCSu3ao0Fy7yJ1U69Wqlw65h0ve73DOya2qAk7YLh7PMj -kr3NXZbgq4Ld1dTXG6BDLB1vaLq7fmHhANE/K9PXubv2dJqWAE8= -=boZE ------END PGP SIGNATURE----- diff --git a/kpublictransport-24.01.95.tar.xz b/kpublictransport-24.01.95.tar.xz new file mode 100644 index 0000000..0408487 --- /dev/null +++ b/kpublictransport-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b84498853561154c48033a93f2b2b9d4c975981a84ad28fdddb66cb5ccd4e8c +size 604704 diff --git a/kpublictransport-24.01.95.tar.xz.sig b/kpublictransport-24.01.95.tar.xz.sig new file mode 100644 index 0000000..bed915d --- /dev/null +++ b/kpublictransport-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45HAACgkQOmpNuDnq +pte6KBAAlUYIyn0QuhfIOnMu4a9uCSY5PCVp2m3ej1Vn4KIQxNZRK9gkmlbu94kv +5dcF7VC3QBW8DYcVGVbzIwywgQlX6+iiP3dVZ3T9eg92Io1lRiU2GllIS9/eAGeP +zH9nVULX6mrXBlLHKq8/npH3Fsw3D8Xb6rHdpe0+bpUf3mbuB1nAs+J83w8du30+ +r4S761rLD/RT4o2ZxavCYC9cJb8SJbpllb7aCdTWT8Ay67xNN1+H9uWu6lXeiGTd +bIVE/Ih+e1tSyvg5Dfwf1ZFA0+FvdFHFxQqwNLk6iscfykCGVKTw+3EKBygXnxLx +mrGqjEVSXlkmp4NpC7OReiwfNLkYB79hSUDrQgpaIGzMUr5zaCFWy7+BMnQCnEad +Y7bexFkRg1hzpAtcdOh9pqjmQjvEviAvQOdavNCXEtK3V4bpUTaiQHoErdMQOtji +nNQ9VP7z9YYlhpEzDWgoCMF7SLgWREK8dgyDMzWveEttjb0v3c8IiZfUaeBhJBxi +sIsdi47CqYg6nZeI/R7Jn6ZVdeSFiMHoEs9s4uMKH8PGZ1CHoLKK3fDl16ZCsquu +UsRsW4pF28v5r0qZTA8Use91LsW3BGrkOTYgop4GWLu7QzUA6A05wmv65vAoktbm +Qsrbd+5z0LjENY63GQ9Jq7M4hXj3LKJW7JgztNQqOnGmkPFxcBc= +=wDo8 +-----END PGP SIGNATURE----- diff --git a/kpublictransport.changes b/kpublictransport.changes index b88777c..cf051c7 100644 --- a/kpublictransport.changes +++ b/kpublictransport.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:14 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:06 UTC 2023 - Christophe Marin diff --git a/kpublictransport.spec b/kpublictransport.spec index 28af811..ace0821 100644 --- a/kpublictransport.spec +++ b/kpublictransport.spec @@ -1,7 +1,7 @@ # # spec file for package kpublictransport # -# 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,56 +16,61 @@ # -%global sover 1 -%global lname libKPublicTransport%{sover} +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kpublictransport -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: QML imports for querying public transport data License: LGPL-2.0-or-later URL: https://www.kde.org -Source0: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source0: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif BuildRequires: bison -BuildRequires: extra-cmake-modules +BuildRequires: doxygen +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: fdupes BuildRequires: flex -%if 0%{?suse_version} == 1500 -BuildRequires: gcc10-c++ -BuildRequires: gcc10-PIE -%endif -BuildRequires: kf5-filesystem BuildRequires: pkgconfig -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5NetworkManagerQt) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6NetworkManagerQt) >= %{kf6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6ToolsTools) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(zlib) -Requires: %{lname} = %{version} -Requires: libKPublicTransportOnboard%{sover} = %{version} %description A library for access realtime public transport data and for performing public +ransport journey queries. + +%package imports +Summary: QML Imports for using kpublictransport + +%description imports +A library for access realtime public transport data and for performing public ransport journey queries. QML imports. -%package -n %{lname} +%package -n libKPublicTransport1 Summary: Library for querying public transport data +Requires: kpublictransport >= %{version} -%description -n %{lname} +%description -n libKPublicTransport1 A library for access realtime public transport data and for performing public ransport journey queries. -%package -n libKPublicTransportOnboard%{sover} +%package -n libKPublicTransportOnboard1 Summary: Library for querying public transport data onboard trains -Requires: %{lname} = %{version} +Requires: libKPublicTransport1 = %{version} -%description -n libKPublicTransportOnboard%{sover} +%description -n libKPublicTransportOnboard1 A library for access realtime public transport data and for performing public transport journey queries. This package contains a library to determine the presence onboard of a train using WiFi SSIDs and provide journey @@ -73,10 +78,9 @@ details. %package devel Summary: Library for querying public transport data -Requires: %{lname} = %{version} -Requires: libKPublicTransportOnboard%{sover} = %{version} -Requires: extra-cmake-modules -Requires: cmake(Qt5Gui) +Requires: libKPublicTransport1 = %{version} +Requires: libKPublicTransportOnboard1 = %{version} +Requires: cmake(Qt6Gui) >= %{qt6_version} Requires: pkgconfig(zlib) %description devel @@ -87,39 +91,40 @@ ransport journey queries.Development files. %autosetup -p1 %build -%if 0%{?suse_version} == 1500 -export CXX=g++-10 -%endif -%cmake_kf5 -d build -- -DBUILD_TESTING=ON -%cmake_build +%cmake_kf6 \ + -DBUILD_TESTING:BOOL=TRUE \ + -DBUILD_QCH:BOOL=TRUE + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install %check %ctest -%ldconfig_scriptlets -n %{lname} -%ldconfig_scriptlets -n libKPublicTransportOnboard%{sover} +%ldconfig_scriptlets -n libKPublicTransport1 +%ldconfig_scriptlets -n libKPublicTransportOnboard1 %files -%dir %{_kf5_qmldir}/org/ -%dir %{_kf5_qmldir}/org/kde/ -%{_kf5_qmldir}/org/kde/kpublictransport/ +%{_kf6_debugdir}/org_kde_kpublictransport.categories +%{_kf6_debugdir}/org_kde_kpublictransport_onboard.categories -%files -n %{lname} +%files imports +%{_kf6_qmldir}/org/kde/kpublictransport/ + +%files -n libKPublicTransport1 %license LICENSES/* -%{_kf5_debugdir}/org_kde_kpublictransport.categories -%{_kf5_libdir}/libKPublicTransport.so.* +%{_kf6_libdir}/libKPublicTransport.so.* -%files -n libKPublicTransportOnboard%{sover} -%{_kf5_libdir}/libKPublicTransportOnboard.so.* -%{_kf5_debugdir}/org_kde_kpublictransport_onboard.categories +%files -n libKPublicTransportOnboard1 +%{_kf6_libdir}/libKPublicTransportOnboard.so.* %files devel +%doc %{_kf6_qchdir}/KPublicTransport.* %{_includedir}/KPublicTransport/ -%{_kf5_cmakedir}/KPublicTransport/ -%{_kf5_libdir}/libKPublicTransport.so -%{_kf5_libdir}/libKPublicTransportOnboard.so +%{_kf6_cmakedir}/KPublicTransport/ +%{_kf6_libdir}/libKPublicTransport.so +%{_kf6_libdir}/libKPublicTransportOnboard.so %changelog