commit 851997a3bfcafc9db862db0ce86d56da7b851b3d
Author: Jakub Bogusz <[email protected]>
Date:   Sun Oct 20 17:34:30 2024 +0200

    - cleanup, updated dependencies

 ka5-arianna.spec | 105 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 69 insertions(+), 36 deletions(-)
---
diff --git a/ka5-arianna.spec b/ka5-arianna.spec
index c20302f..b566938 100644
--- a/ka5-arianna.spec
+++ b/ka5-arianna.spec
@@ -1,10 +1,15 @@
 #
 # Conditional build:
 %bcond_with    tests           # test suite
+%bcond_without qtwebengine     # QtWebEngine support
+
+%ifarch x32
+%undefine      with_qtwebengine
+%endif
 
 %define                kdeappsver      23.08.5
-%define                qtver           5.15.2
-%define                kf5ver          5.71.0
+%define                qt_ver          5.15.10
+%define                kf_ver          5.98.0
 %define                kaname          arianna
 Summary:       An ebook reader
 Summary(pl.UTF-8):     Czytnik e-booków
@@ -15,44 +20,72 @@ License:    GPL v3
 Group:         X11/Applications
 Source0:       
https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
 # Source0-md5: a658239afbb982d5a78a0e6766ad2921
-URL:           https://kde.org/
-BuildRequires: Qt5Core-devel
-BuildRequires: Qt5Gui-devel >= 5.15.2
-BuildRequires: Qt5Network-devel >= 5.15.10
-BuildRequires: Qt5Positioning-devel >= 5.15
-BuildRequires: Qt5Qml-devel >= 5.15.10
-BuildRequires: Qt5Quick-controls2-devel
-BuildRequires: Qt5Quick-devel
-BuildRequires: Qt5Sql-devel
-BuildRequires: Qt5Svg-devel
-BuildRequires: Qt5Test-devel
-BuildRequires: Qt5WebChannel-devel
-BuildRequires: Qt5WebSockets-devel
-BuildRequires: Qt5Widgets-devel >= 5.15.2
-BuildRequires: Qt5Xml-devel >= 5.15.2
-BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
-BuildRequires: gettext-devel
-BuildRequires: kf5-baloo-devel >= 5.98.0
-BuildRequires: kf5-extra-cmake-modules >= 5.110.0
-BuildRequires: kf5-karchive-devel >= 5.98.0
-BuildRequires: kf5-kconfig-devel >= 5.98.0
-BuildRequires: kf5-kcoreaddons-devel >= 5.110.0
-BuildRequires: kf5-kdbusaddons-devel >= 5.98.0
-BuildRequires: kf5-kfilemetadata-devel >= 5.110.0
-BuildRequires: kf5-ki18n-devel >= 5.98.0
-BuildRequires: kf5-kirigami2-devel >= 5.98.0
+URL:           https://apps.kde.org/arianna/
+BuildRequires: Qt5Core-devel >= %{qt_ver}
+BuildRequires: Qt5Gui-devel >= %{qt_ver}
+BuildRequires: Qt5Network-devel >= %{qt_ver}
+BuildRequires: Qt5Qml-devel >= %{qt_ver}
+BuildRequires: Qt5Quick-controls2-devel >= %{qt_ver}
+BuildRequires: Qt5Quick-devel >= %{qt_ver}
+BuildRequires: Qt5Sql-devel >= %{qt_ver}
+BuildRequires: Qt5Svg-devel >= %{qt_ver}
+BuildRequires: Qt5Test-devel >= %{qt_ver}
+BuildRequires: Qt5WebChannel-devel >= %{qt_ver}
+%if %{with qtwebengine}
+BuildRequires: Qt5WebEngine-devel >= %{qt_ver}
+%endif
+BuildRequires: Qt5WebSockets-devel >= %{qt_ver}
+BuildRequires: Qt5Widgets-devel >= %{qt_ver}
+BuildRequires: Qt5Xml-devel >= %{qt_ver}
+BuildRequires: cmake >= 3.16
+BuildRequires: gettext-tools
+BuildRequires: kf5-baloo-devel >= %{kf_ver}
+BuildRequires: kf5-extra-cmake-modules >= %{kf_ver}
+BuildRequires: kf5-karchive-devel >= %{kf_ver}
+BuildRequires: kf5-kconfig-devel >= %{kf_ver}
+BuildRequires: kf5-kcoreaddons-devel >= %{kf_ver}
+BuildRequires: kf5-kdbusaddons-devel >= %{kf_ver}
+BuildRequires: kf5-kfilemetadata-devel >= %{kf_ver}
+BuildRequires: kf5-ki18n-devel >= %{kf_ver}
+BuildRequires: kf5-kirigami2-devel >= %{kf_ver}
 BuildRequires: kf5-kirigami-addons-devel >= 0.10
-BuildRequires: kf5-kquickcharts-devel >= 5.98.0
-BuildRequires: kf5-kwindowsystem-devel >= 5.98.0
+BuildRequires: kf5-kquickcharts-devel >= %{kf_ver}
+BuildRequires: kf5-kwindowsystem-devel >= %{kf_ver}
 BuildRequires: kf5-qqc2-desktop-style-devel
 BuildRequires: ninja
 BuildRequires: pkgconfig
 BuildRequires: python3
-BuildRequires: qt5-build >= %{qtver}
+BuildRequires: qt5-build >= %{qt_ver}
 BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+Requires:      Qt5Core >= %{qt_ver}
+Requires:      Qt5Gui >= %{qt_ver}
+Requires:      Qt5Network >= %{qt_ver}
+Requires:      Qt5Qml >= %{qt_ver}
+Requires:      Qt5Quick-controls2 >= %{qt_ver}
+Requires:      Qt5Quick >= %{qt_ver}
+Requires:      Qt5Sql >= %{qt_ver}
+Requires:      Qt5Svg >= %{qt_ver}
+Requires:      Qt5WebChannel >= %{qt_ver}
+%if %{with qtwebengine}
+Requires:      Qt5WebEngine >= %{qt_ver}
+%endif
+Requires:      Qt5WebSockets >= %{qt_ver}
+Requires:      Qt5Widgets >= %{qt_ver}
+Requires:      Qt5Xml >= %{qt_ver}
+Requires:      kf5-baloo >= %{kf_ver}
+Requires:      kf5-karchive >= %{kf_ver}
+Requires:      kf5-kconfig >= %{kf_ver}
+Requires:      kf5-kcoreaddons >= %{kf_ver}
+Requires:      kf5-kdbusaddons >= %{kf_ver}
+Requires:      kf5-kfilemetadata >= %{kf_ver}
+Requires:      kf5-ki18n >= %{kf_ver}
+Requires:      kf5-kirigami2 >= %{kf_ver}
+Requires:      kf5-kirigami-addons >= 0.10
+Requires:      kf5-kquickcharts >= %{kf_ver}
+Requires:      kf5-kwindowsystem >= %{kf_ver}
+Requires:      kf5-qqc2-desktop-style
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -69,7 +102,8 @@ Arianna to czytnik e-booków.
        -B build \
        -G Ninja \
        %{!?with_tests:-DBUILD_TESTING=OFF} \
-       -DHTML_INSTALL_DIR=%{_kdedocdir} \
+       -DKDE_INSTALL_DOCBUNDLEDIR=%{_kdedocdir} \
+       -DKDE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 
 %ninja_build -C build
@@ -83,15 +117,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %ninja_install -C build
 
-%{__rm} -r $RPM_BUILD_ROOT%{_kdedocdir}/{sr,zh_CN}
-
-%find_lang %{kaname} --all-name --with-kde
+%find_lang %{kaname}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kaname}.lang
 %defattr(644,root,root,755)
+%doc README.md
 %attr(755,root,root) %{_bindir}/arianna
 %{_desktopdir}/org.kde.arianna.desktop
 %{_iconsdir}/hicolor/scalable/apps/org.kde.arianna.svg
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-arianna.git/commitdiff/851997a3bfcafc9db862db0ce86d56da7b851b3d

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to