Revert "- 24.01.95"

[packages/ka5-itinerary.git] / ka5-itinerary.spec

diff --git a/ka5-itinerary.spec b/ka5-itinerary.spec
index 7be4a14f54908bf8651162379909c724e97d0234..6d24b9644d8bb0e3fcf1d0f89f9cfa5e9dacec76 100644 (file)
--- a/ka5-itinerary.spec
+++ b/ka5-itinerary.spec
@@ -1,18 +1,18 @@
 #
 # Conditional build:
 %bcond_with    tests           # build with tests
-%define                kdeappsver      22.12.0
+%define                kdeappsver      23.08.4
 %define                kframever       5.94.0
 %define                qtver           5.15.2
 %define                kaname          itinerary
 Summary:       Itinerary and boarding pass management application
 Name:          ka5-%{kaname}
-Version:       22.12.0
-Release:       2
+Version:       23.08.4
+Release:       1
 License:       GPL v2+/LGPL v2.1+
 Group:         X11/Libraries
 Source0:       https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5: ce41470f8b21781d5d13a6f656e4e6ed
+# Source0-md5: 09e6129c6410807e0a0f1166119df80b
 URL:           https://community.kde.org/
 BuildRequires: Qt5DBus-devel >= 5.15.2
 BuildRequires: Qt5Gui-devel >= 5.15.2
@@ -24,7 +24,7 @@ BuildRequires:        Qt5Quick-controls2-devel
 BuildRequires: Qt5Quick-devel
 BuildRequires: Qt5Test-devel
 BuildRequires: Qt5Widgets-devel >= 5.15.2
-BuildRequires: cmake >= 3.5
+BuildRequires: cmake >= 3.20
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel
 BuildRequires: gettext-devel
@@ -57,6 +57,7 @@ BuildRequires:        kf5-kwidgetsaddons-devel >= 5.93.0
 BuildRequires: kf5-kxmlgui-devel >= 5.93.0
 BuildRequires: kf5-networkmanager-qt-devel >= 5.88
 BuildRequires: kf5-qqc2-desktop-style-devel >= 5.88
+BuildRequires: kirigami-addons-devel >= 0.9
 BuildRequires: ninja
 BuildRequires: pkgconfig
 BuildRequires: qt5-build >= %{qtver}
@@ -75,18 +76,16 @@ Itinerary and boarding pass management application.
 %setup -q -n %{kaname}-%{version}
 
 %build
-install -d build
-cd build
 %cmake \
+       -B build \
        -G Ninja \
        %{!?with_tests:-DBUILD_TESTING=OFF} \
        -DHTML_INSTALL_DIR=%{_kdedocdir} \
-       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-       ..
-%ninja_build
+       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+%ninja_build -C build
 
 %if %{with tests}
-ctest
+ctest --test-dir build
 %endif
 
 
@@ -112,22 +111,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/knotifications5/itinerary.notifyrc
 %{_datadir}/metainfo/org.kde.itinerary.appdata.xml
 %{_datadir}/qlogging-categories5/org_kde_itinerary.categories
-%{_libdir}/qt5/plugins/kf5/kfilemetadata/kfilemetadata_itineraryextractor.so
-%dir %{_libdir}/qt5/qml/org/kde/itinerary
-%dir %{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons
-%dir %{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/ClockFace.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/DateInput.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/DatePicker.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/DatePopup.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/TimeInput.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/TimeLabel.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/TimePicker.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/libitinerary-dateandtimeplugin.so
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/qmldir
-%{_libdir}/qt5/plugins/kf5/thumbcreator/itinerarythumbnail.so
-%dir %{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/private
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/private/ClockElement.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/private/DesktopDateInput.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/private/Hand.qml
-%{_libdir}/qt5/qml/org/kde/itinerary/kirigamiaddons/dateandtime/private/MobileDateInput.qml
+%attr(755,root,root) %{_libdir}/qt5/plugins/kf5/kfilemetadata/kfilemetadata_itineraryextractor.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kf5/thumbcreator/itinerarythumbnail.so