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/kopeninghours-23.08.4.tar.xz b/kopeninghours-23.08.4.tar.xz deleted file mode 100644 index bfc484d..0000000 --- a/kopeninghours-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f2f854c74bcef28adc1a5ee9b399d3ef8922ea616f5b7b4a84d2b083f75d670 -size 72316 diff --git a/kopeninghours-23.08.4.tar.xz.sig b/kopeninghours-23.08.4.tar.xz.sig deleted file mode 100644 index 5830f5e..0000000 --- a/kopeninghours-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8VAACgkQu0YzUNbv -Me9T8RAAhjeq8jhnpTWoFBpl8iZeqTzlTQdt7ANgVtb2Jk9RSsvN7d8k7ll0onog -QOv1v73BddE69YmV3kDHLy7szgl3vXziDD81bi2RyOjE7AvwV8ddFd37mXo9Yct0 -NzXWtR3h4ViVvt2Jhjhqy1bQJjxnFRPHcgOxY3zbcNveP4AofthtxfQjm87QMHa9 -ORfCt1px8vD5dY/mnQ+Qf87MaWewxSA7/eYyhob53zWErcqoAkXtXavCHRuG0oGk -F7KK2f7tvX9MwmkkOr1VE+5I1gr+4c8ztO4aeVqII+4y7jcKjPiUMouWKLBtL0Cv -qC5zR24lKa2gltVAjqFxzDLWPsKZJKtpMw3tyI+CF8veQH7kATuiJltWU5GgVbqR -TMbQcN8uybjFKxIIf6HWoukklt9va1vyIhK9wi6FRHBwdRH5RNFZC3omNlPsXNEI -UTfJFccUm5G3VUdplPHzvwONvoG0klyjU//dz/vEK/V8Mzu4FDkfEC1lRgXRGyys -WenZN26uuaRfmFIST4UD4GhUum2HBe57HLE5M73/RD5EbbzgmSOFubOk/OSR15lL -DmfZ7L1qURGdrrnmcFZNnUfXntGDZpe7kAY9D8Jd0/u9fXauQTpppsgCb+gwThHM -EhXoe9vQH+EJNgj9E+gdsGMZZ9dgefSiszPJK6zFbI0EFERSCek= -=LR86 ------END PGP SIGNATURE----- diff --git a/kopeninghours-24.01.95.tar.xz b/kopeninghours-24.01.95.tar.xz new file mode 100644 index 0000000..c661245 --- /dev/null +++ b/kopeninghours-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89234731f95594884515bd90fdfef8e0a2774add35e23bedee906d22c7d34b21 +size 72700 diff --git a/kopeninghours-24.01.95.tar.xz.sig b/kopeninghours-24.01.95.tar.xz.sig new file mode 100644 index 0000000..096982e --- /dev/null +++ b/kopeninghours-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45HgACgkQOmpNuDnq +ptd74w/+Kvic+XLvU7px+OP/14rE/rjsM+7btFfSGinNH7ju0DI600xLg7aiU2+C +Suas89eFGSEhC4t05VGQSYBhCbygi8PGwhZH/D8ZchyG+byQBbOoqIrnn4gbCQ9L +CcjsBLiKb8X/I2wzmMF8KmjyuamQJheSkooCQMjsL5mFZOhNpS9KST5JE+TtoCS5 +Ygdw7RRyfAfYxK9g1fnkzdgOOhuWkYYW52I+v9aqIYLH7P4/1PqTn8CCujiPZBB6 +flhYvu3NmhVc4O0Ve8DRxXyS5Z6hhNeiJ9TxJ82Sj4JnA8DAdtvbHznqHNl1wBd7 +IuNsUuAiRja0oqpF30LshrCAfBjUh81VvKF33LoqnV8WjJIw+Ezw7s7SnPj6m+5B +U8spEMuysNzI7mhnEJMHBDAEddfvAokMh9grUqh51KCzYtFwGt2ptJDaBMScVE2n +oeSba86lRO+EFCQBNe63b2DGgnDXmHaHWeND2tuxYfpbqIZyfMgvo2YEm/C/qzGg +u2ENlCB7BuJZybPdy3gMx5s/JB2zDPX36L6WW1gwg8McHVoUJCIPNnZSwugeZ7By +7pghyqqsa0SA7uQ72nNtWFDHJI+UP5CKK3t7eBg0klCMf7EVaQUO8FZh74R2DZI3 +8ZRUwsQj8Wshd91k9dqhoykq2uECYFKBKftEmULw3w0vtfoBcFA= +=6Gz8 +-----END PGP SIGNATURE----- diff --git a/kopeninghours.changes b/kopeninghours.changes index a5ea73a..dfb5ba4 100644 --- a/kopeninghours.changes +++ b/kopeninghours.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:08 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Fri Dec 15 21:31:01 UTC 2023 - Christophe Marin diff --git a/kopeninghours.spec b/kopeninghours.spec index 8be57cd..d9c3ba3 100644 --- a/kopeninghours.spec +++ b/kopeninghours.spec @@ -1,7 +1,7 @@ # # spec file for package kopeninghours # -# 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,33 +16,46 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kopeninghours -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: OSM opening hours expression parser and evaluator License: LGPL-2.0-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: 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: flex -BuildRequires: cmake(KF5Holidays) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(Qt5Core) >= 5.15.2 -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(KF6Holidays) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6ToolsTools) >= %{qt6_version} %description A library for parsing and evaluating OSM opening hours expressions. +%package imports +Summary: QML imports for kopeninghours +Requires: libKOpeningHours1 = %{version} + +%description imports +kopeninghours is a library for parsing and evaluating OSM opening hours +expressions. +This package contains QML imports for using kopeninghours in QML apps. + %package -n libKOpeningHours1 Summary: OSM opening hours expression parser and evaluator -Recommends: %{name} +Requires: kopeninghours >= %{version} %description -n libKOpeningHours1 A library for parsing and evaluating OSM opening hours expressions. @@ -61,13 +74,17 @@ library. %autosetup -p1 %build -%cmake_kf5 -d build -- -DBUILD_TESTING=ON -%cmake_build +%cmake_kf6 \ + -DBUILD_WITH_QT6:BOOL=TRUE \ + -DBUILD_QCH:BOOL=TRUE \ + -DBUILD_TESTING:BOOL=TRUE + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man +%find_lang %{name} %check export QT_QPA_PLATFORM=offscreen @@ -76,21 +93,22 @@ export QT_QPA_PLATFORM=offscreen %ldconfig_scriptlets -n libKOpeningHours1 %files -%dir %{_kf5_qmldir}/org -%dir %{_kf5_qmldir}/org/kde -%{_kf5_qmldir}/org/kde/kopeninghours/ +%{_kf6_debugdir}/org_kde_kopeninghours.categories + +%files imports +%{_kf6_qmldir}/org/kde/kopeninghours/ %files -n libKOpeningHours1 %license LICENSES/* -%{_kf5_debugdir}/org_kde_kopeninghours.categories -%{_kf5_libdir}/libKOpeningHours.so.* +%{_kf6_libdir}/libKOpeningHours.so.* %files devel +%doc %{_kf6_qchdir}/KOpeningHours.* %{_includedir}/KOpeningHours/ %{_includedir}/kopeninghours/ %{_includedir}/kopeninghours_version.h -%{_kf5_cmakedir}/KOpeningHours/ -%{_kf5_libdir}/libKOpeningHours.so +%{_kf6_cmakedir}/KOpeningHours/ +%{_kf6_libdir}/libKOpeningHours.so %files lang -f %{name}.lang