#3 update to 24.01.85
Merged 6 months ago by ngompa. Opened 6 months ago by loise.
Unknown source rawhide  into  rawhide

file modified
+1
@@ -68,3 +68,4 @@

  /kmplot-23.08.0.tar.xz

  /kmplot-23.08.1.tar.xz

  /kmplot-23.08.2.tar.xz

+ /kmplot-24.01.85.tar.xz

file modified
+37 -50
@@ -2,48 +2,35 @@

  

  Name:    kmplot

  Summary: Mathematical Function Plotter 

- Version: 23.08.2

+ Version: 24.01.85

  Release: 1%{?dist}

  

- License: GPLv2+

+ License: GPL-2.0-or-later

  URL:     https://cgit.kde.org/%{name}.git

+ Source0: http://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz

  

- %global revision %(echo %{version} | cut -d. -f3)

- %if %{revision} >= 50

- %global stable unstable

- %else

- %global stable stable

- %endif

- Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz

- 

- BuildRequires: desktop-file-utils

- BuildRequires: extra-cmake-modules

+ BuildRequires: gcc-c++

+ BuildRequires: cmake

  BuildRequires: gettext

- BuildRequires: kf5-kcompletion-devel

- BuildRequires: kf5-kconfig-devel

- BuildRequires: kf5-kconfigwidgets-devel

- BuildRequires: kf5-kcoreaddons-devel

- BuildRequires: kf5-kcrash-devel

- BuildRequires: kf5-kdbusaddons-devel

- BuildRequires: kf5-kdeclarative-devel

- BuildRequires: kf5-kdelibs4support-devel

- BuildRequires: kf5-kdoctools-devel

- BuildRequires: kf5-kguiaddons-devel

- BuildRequires: kf5-ki18n-devel

- BuildRequires: kf5-kiconthemes-devel

- BuildRequires: kf5-kio-devel

- BuildRequires: kf5-kitemviews-devel

- BuildRequires: kf5-kjobwidgets-devel

- BuildRequires: kf5-knewstuff-devel

- BuildRequires: kf5-knotifyconfig-devel

- BuildRequires: kf5-kparts-devel

- BuildRequires: kf5-kservice-devel

- BuildRequires: kf5-kwidgetsaddons-devel

- BuildRequires: kf5-kwindowsystem-devel

- BuildRequires: kf5-kxmlgui-devel

- BuildRequires: kf5-rpm-macros

+ BuildRequires: desktop-file-utils

  BuildRequires: libappstream-glib

- BuildRequires: pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) pkgconfig(Qt5Svg) pkgconfig(Qt5PrintSupport)

+ BuildRequires: kf6-rpm-macros

+ BuildRequires: extra-cmake-modules

+ 

+ BuildRequires: git

+ BuildRequires: cmake(Qt6Core)

+ BuildRequires: cmake(Qt6Gui)

+ BuildRequires: cmake(Qt6Svg)

+ BuildRequires: cmake(Qt6Widgets)

+ BuildRequires: cmake(Qt6PrintSupport)

+ BuildRequires: cmake(KF6Crash)

+ BuildRequires: cmake(KF6GuiAddons)

+ BuildRequires: cmake(KF6I18n)

+ BuildRequires: cmake(KF6Parts)

+ BuildRequires: cmake(KF6WidgetsAddons)

+ BuildRequires: cmake(KF6DocTools)

+ BuildRequires: cmake(KF6DBusAddons)

+ BuildRequires: cmake(KF6TextWidgets)

  

  # when split occurred

  Conflicts: kdeedu-math < 4.7.0-10
@@ -57,7 +44,9 @@

  

  

  %build

- %{cmake_kf5}

+ %cmake_kf6 \

+ 	-DQT_MAJOR_VERSION=6

+ 

  %cmake_build

  

  
@@ -68,30 +57,28 @@

  

  

  %check

- appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml ||:

- desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:

+ appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.appdata.xml

+ desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.desktop

  

  

  %files -f %{name}.lang

  %license LICENSES/*

  #doc README

- %{_kf5_bindir}/%{name}

+ %{_kf6_bindir}/%{name}

  #{_sysconfdir}/xdg/%{name}.knsrc

- %{_kf5_datadir}/applications/org.kde.%{name}.desktop

- %{_kf5_metainfodir}/org.kde.%{name}.appdata.xml

- %{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*

- #{_kf5_datadir}/%{name}/

- #{_kf5_datadir}/kconf_update/%{name}*

- %{_kf5_datadir}/kxmlgui5/%{name}/

- #{_kf5_datadir}/sounds/%{name}/

- %{_kf5_datadir}/config.kcfg/%{name}.kcfg

- %{_kf5_datadir}/kservices5/%{name}_part.desktop

- %{_kf5_plugindir}/parts/%{name}part.so

+ %{_kf6_datadir}/applications/org.kde.%{name}.desktop

+ %{_kf6_metainfodir}/org.kde.%{name}.appdata.xml

+ %{_kf6_datadir}/icons/hicolor/*/apps/%{name}.*

+ %{_kf6_datadir}/config.kcfg/%{name}.kcfg

+ %{_kf6_plugindir}/parts/%{name}part.so

  %{_datadir}/dbus-1/interfaces/org.kde.%{name}.*.xml

  %{_mandir}/man1/kmplot.*

  

  

  %changelog

+ * Thu Dec 28 2023 Marie Loise Nolden <loise@kde.org> - 24.01.85-1

+ - 24.01.85

+ 

  * Thu Oct 12 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.08.2-1

  - 23.08.2

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (kmplot-23.08.2.tar.xz) = e271ff7ad4d4d3a110d244701d028626115dee655fc397fe3bcf7c63b2d4c93836031e91aa3cdfa20640cebcf64595294c07d7e6aeb13790fae0656cdc1b3211

+ SHA512 (kmplot-24.01.85.tar.xz) = 146f192c6b2a8b5f17957ffa186d867ab3cd0b1c3d10daeb3efcd1cc37fa3da07c3cf19953738671fb860fc4d53c64f798560878ad6a5fe181d44f30961a1e8a

Update to 24.01.85 using qt6/kf6
- fix source url macros
- fix SPDX
- fix validation
- use cmake macros for BR

Pull-Request has been merged by ngompa

6 months ago