commit 69bfeec37872e63f20027e50d6742b1e149c3623
Author: Witold Filipczyk <[email protected]>
Date: Thu Aug 24 17:48:26 2023 +0200
- updated to 23.08.0; cmake -B build
ka5-cantor.spec | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/ka5-cantor.spec b/ka5-cantor.spec
index ca20c43..74c69f4 100644
--- a/ka5-cantor.spec
+++ b/ka5-cantor.spec
@@ -7,18 +7,18 @@
%undefine with_luajit
%endif
-%define kdeappsver 23.04.3
+%define kdeappsver 23.08.0
%define kframever 5.94.0
%define qtver 5.15.2
%define kaname cantor
Summary: Cantor
Name: ka5-%{kaname}
-Version: 23.04.3
+Version: 23.08.0
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: 6776911fc57f50f960a818491168e8be
+# Source0-md5: 74e48f23aa78432435ae5e7746e868b5
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}
@@ -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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ka5-cantor.git/commitdiff/69bfeec37872e63f20027e50d6742b1e149c3623
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
