From fb84a4f138ef831243b85008f2fc0667686d511e Mon Sep 17 00:00:00 2001 From: kiritakekumi Date: Tue, 3 Mar 2026 11:35:22 +0800 Subject: [PATCH] fix --- kdeplasma6-addons/kdeplasma6-addons.spec | 2 +- plasma5support6/plasma5support6.spec | 27 ++++++++++++++---------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/kdeplasma6-addons/kdeplasma6-addons.spec b/kdeplasma6-addons/kdeplasma6-addons.spec index b31d918..531c0d1 100644 --- a/kdeplasma6-addons/kdeplasma6-addons.spec +++ b/kdeplasma6-addons/kdeplasma6-addons.spec @@ -56,7 +56,7 @@ BuildRequires: pkgconfig(icu-uc) Requires: kf6-kitemmodels-imports >= %{kf6_version} Requires: kf6-purpose >= %{kf6_version} Requires: kirigami-addons6 -Requires: plasma5support6 >= %{_plasma6_bugfix} +Requires: plasma5support >= %{_plasma6_bugfix} Provides: plasma-addons = %{version} Obsoletes: plasma-addons < %{version} Provides: plasma5-addons = %{version} diff --git a/plasma5support6/plasma5support6.spec b/plasma5support6/plasma5support6.spec index ca54c18..8ee1158 100644 --- a/plasma5support6/plasma5support6.spec +++ b/plasma5support6/plasma5support6.spec @@ -1,24 +1,30 @@ +# SPDX-FileCopyrightText: (C) 2026 Institute of Software, Chinese Academy of Sciences (ISCAS) +# SPDX-FileCopyrightText: (C) 2026 openRuyi Project Contributors +# SPDX-FileContributor: jingyupu +# +# SPDX-License-Identifier: MulanPSL-2.0 %define qt6_version 6.9.0 -%define rname plasma5support # Full KF6 version (e.g. 6.0.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} -# Note: despite being in the plasma namespace upstream, the build system follows the frameworks conventions -Name: plasma5support6 +Name: plasma5support Version: 6.5.5 -Release: 0 +Release: %autorelease Summary: KF6 Porting aid License: LGPL-2.0-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +VCS: git:https://invent.kde.org/plasma/plasma5support +#!RemoteAsset +Source: https://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz + BuildRequires: doxygen BuildRequires: kf6-extra-cmake-modules >= %{_kf6_bugfix_version} BuildRequires: pkgconfig -BuildRequires: qt6-qtbase-private-devel +BuildRequires: qt6-base-private-devel BuildRequires: cmake(KF6Config) >= %{_kf6_bugfix_version} BuildRequires: cmake(KF6CoreAddons) >= %{_kf6_bugfix_version} BuildRequires: cmake(KF6GuiAddons) >= %{_kf6_bugfix_version} @@ -50,18 +56,18 @@ BuildRequires: pkgconfig(x11) %description Support components for porting from KF5/Qt5 to KF6/Qt6. -%package devel +%package devel Summary: Development Files for the plasma5support framework Requires: %{name}%{?_isa} = %{version}-%{release} Requires: cmake(KF6CoreAddons) >= %{_kf6_bugfix_version} Requires: cmake(KF6Service) >= %{_kf6_bugfix_version} Requires: cmake(Qt6Gui) >= %{qt6_version} -%description devel +%description devel Development Files for the plasma5support framework. %prep -%autosetup -p1 -n %{rname}-%{version} +%autosetup -p1 -n %{name}-%{version} %build %cmake_kf6 -DBUILD_QCH:BOOL=TRUE @@ -78,8 +84,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en_GB/ # Use langpacks macro to auto-split translations %find_lang %{name} --with-qt --all-name --generate-subpackages -%ldconfig_scriptlets - %files %license LICENSES/* %doc README.md @@ -129,3 +133,4 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en_GB/ %{_kf6_libdir}/libplasma-geolocation-interface.so %changelog +%{?autochangelog}