diff --git a/.gitignore b/.gitignore index 0878928..be74591 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /kcalc-23.08.0.tar.xz /kcalc-23.08.1.tar.xz /kcalc-23.08.2.tar.xz +/kcalc-24.01.75.tar.xz diff --git a/kcalc.spec b/kcalc.spec index 99d4907..ce8f436 100644 --- a/kcalc.spec +++ b/kcalc.spec @@ -1,18 +1,12 @@ Name: kcalc Summary: Scientific Calculator -Version: 23.08.2 +Version: 24.01.75 Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/utils/%{name} -%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 +Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz ## upstreamable patches # fix arithmetic fault in mod, factorial @@ -23,48 +17,25 @@ BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: extra-cmake-modules -BuildRequires: kf5-rpm-macros -BuildRequires: kf5-kcompletion-devel -BuildRequires: kf5-kconfig-devel -BuildRequires: kf5-kconfigwidgets-devel -BuildRequires: kf5-kcoreaddons-devel -BuildRequires: kf5-kdbusaddons-devel -BuildRequires: kf5-kdeclarative-devel -BuildRequires: kf5-kdoctools-devel -BuildRequires: kf5-kguiaddons-devel -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kiconthemes-devel -BuildRequires: kf5-kinit-devel >= 5.10.0-3 -BuildRequires: kf5-kitemviews-devel -BuildRequires: kf5-kio-devel -BuildRequires: kf5-kjobwidgets-devel -BuildRequires: kf5-knewstuff-devel -BuildRequires: kf5-knotifications-devel -BuildRequires: kf5-knotifyconfig-devel -BuildRequires: kf5-knewstuff-devel -BuildRequires: kf5-kservice-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: kf5-kwidgetsaddons-devel -BuildRequires: kf5-kxmlgui-devel - -BuildRequires: cmake(KF5Crash) - -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: kf6-rpm-macros + +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Widgets) +BuildRequires: pkgconfig(Qt6Core5Compat) + +BuildRequires: cmake(KF6CoreAddons) +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6Config) +BuildRequires: cmake(KF6ConfigWidgets) +BuildRequires: cmake(KF6GuiAddons) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6Notifications) +BuildRequires: cmake(KF6XmlGui) +BuildRequires: cmake(KF6DocTools) BuildRequires: gmp-devel BuildRequires: mpfr-devel -%{?kf5_kinit_requires} - -# when split occured -Conflicts: kdeutils-common < 6:4.7.80 - -# translations moved here -Conflicts: kde-l10n < 17.03 - -Obsoletes: kdeutils-kcalc < 6:4.7.80 -Provides: kdeutils-kcalc = 6:%{version}-%{release} - %description KCalc is a calculator which offers many more mathematical functions than meet the eye on a first glance. @@ -75,7 +46,7 @@ functions than meet the eye on a first glance. %build -%cmake_kf5 %{?flatpak:-DINSTALL_ICONS=ON} +%cmake_kf6 %{?flatpak:-DINSTALL_ICONS=ON} %cmake_build @@ -87,25 +58,28 @@ functions than meet the eye on a first glance. %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} -%{_kf5_datadir}/applications/org.kde.%{name}.desktop -%{_kf5_datadir}/kglobalaccel/org.kde.%{name}.desktop -%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml -%{_kf5_datadir}/kconf_update/%{name}* -%{_kf5_datadir}/config.kcfg/%{name}.kcfg +%{_kf6_bindir}/%{name} +%{_kf6_datadir}/applications/org.kde.%{name}.desktop +%{_kf6_datadir}/kglobalaccel/org.kde.%{name}.desktop +%{_kf6_metainfodir}/org.kde.%{name}.appdata.xml +%{_kf6_datadir}/kconf_update/%{name}* +%{_kf6_datadir}/config.kcfg/%{name}.kcfg %if 0%{?flatpak} -%{_kf5_datadir}/icons/hicolor/*/*/accessories-calculator.* +%{_kf6_datadir}/icons/hicolor/*/*/accessories-calculator.* %endif %changelog +* Fri Nov 24 2023 Yaakov Selkowitz - 24.01.75-1 +- 24.01.75 + * Thu Oct 12 2023 Marc Deop i Argemí - 23.08.2-1 - 23.08.2 diff --git a/sources b/sources index f3a529b..d027a4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kcalc-23.08.2.tar.xz) = 182c4ddc04f3bae94648a069b1fa4a9c5f75d9f0bb152bdc9e5d8112590371e6cae81777a0bd0108497ee37da446fbd010f45d7e5288c83721aed402b109d383 +SHA512 (kcalc-24.01.75.tar.xz) = 1a5e08b04e2871a87328e47e395553bf63f78d7839f30f4002569fa4f66f6cb5310d28973b3001ca020aeffdbf1cfece19a5e8d4e1e35284357e626e4491dc85