- updated to 23.08.5

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

diff --git a/ka5-cantor.spec b/ka5-cantor.spec
index 1288216fe8f0121f6890e61f94515e234281a712..68591b090663339eec823a83d204b0c11c80f355 100644 (file)
--- a/ka5-cantor.spec
+++ b/ka5-cantor.spec
@@ -7,18 +7,18 @@
 %undefine      with_luajit
 %endif
 
-%define                kdeappsver      22.04.0
-%define                kframever       5.56.0
-%define                qtver           5.9.0
+%define                kdeappsver      23.08.5
+%define                kframever       5.94.0
+%define                qtver           5.15.2
 %define                kaname          cantor
 Summary:       Cantor
 Name:          ka5-%{kaname}
-Version:       22.04.0
+Version:       23.08.5
 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: c57880057113282b1cdc7154b57ae558
+# Source0-md5: b2579f3ac8b0618ebd14b21d3c1342a1
 URL:           https://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5Gui-devel
@@ -32,7 +32,7 @@ BuildRequires:        Qt5Widgets-devel
 BuildRequires: Qt5Xml-devel
 BuildRequires: Qt5XmlPatterns-devel
 BuildRequires: R
-BuildRequires: cmake >= 2.8.12
+BuildRequires: cmake >= 3.20
 BuildRequires: gettext-devel
 BuildRequires: ka5-analitza-devel
 BuildRequires: kf5-extra-cmake-modules >= %{kframever}
@@ -63,7 +63,7 @@ BuildRequires:        rpmbuild(macros) >= 1.164
 BuildRequires: shared-mime-info
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-ExclusiveArch: i686  %{x8664}
+ExcludeArch:   x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -117,18 +117,16 @@ Pliki nagłówkowe dla programistów używających %{kaname}.
 %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
 
 
@@ -136,8 +134,6 @@ ctest
 rm -rf $RPM_BUILD_ROOT
 %ninja_install -C build
 
-sed -i -e 's#/usr/bin/env bash#/bin/bash#' $RPM_BUILD_ROOT%{_datadir}/cantor/sagebackend/cantor-execsage
-
 %find_lang %{kaname} --all-name --with-kde
 
 %clean
@@ -201,8 +197,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/qt5/plugins/cantor/panels/cantor_variablemanagerplugin.so
 %{_desktopdir}/org.kde.cantor.desktop
 %dir %{_datadir}/cantor
-%dir %{_datadir}/cantor/sagebackend
-%attr(755,root,root) %{_datadir}/cantor/sagebackend/cantor-execsage
 %{_datadir}/cantor/latex
 %{_datadir}/cantor/maximabackend
 %{_datadir}/cantor/octavebackend