From 2a2b44c51241fe06faa4e77609ecd3072d49f59a Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 24 Nov 2025 02:51:39 -0800 Subject: [PATCH] fix(kde-material-you-colors): Metadata changes (#7186) (#7644) * fix(kde-material-you-colors): Metadata changes Comment out the appdata XML file entry in the spec. * feat: Use %terra_appstream for now * fix: Metainfo * feat: Rebuild for Qt6 automatically --------- (cherry picked from commit 0b0e93f426ad18e59b004a4145b91ae06fc3df5f) Signed-off-by: Gilver Co-authored-by: Gilver --- .../kde-material-you-colors/VERSION_qt6-qtbase.txt | 1 + .../kde-material-you-colors.spec | 8 +++++++- anda/themes/kde-material-you-colors/update.rhai | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 anda/themes/kde-material-you-colors/VERSION_qt6-qtbase.txt diff --git a/anda/themes/kde-material-you-colors/VERSION_qt6-qtbase.txt b/anda/themes/kde-material-you-colors/VERSION_qt6-qtbase.txt new file mode 100644 index 0000000000..cf79bf90ee --- /dev/null +++ b/anda/themes/kde-material-you-colors/VERSION_qt6-qtbase.txt @@ -0,0 +1 @@ +6.10.0 diff --git a/anda/themes/kde-material-you-colors/kde-material-you-colors.spec b/anda/themes/kde-material-you-colors/kde-material-you-colors.spec index 19735b7214..88d25dd3fd 100644 --- a/anda/themes/kde-material-you-colors/kde-material-you-colors.spec +++ b/anda/themes/kde-material-you-colors/kde-material-you-colors.spec @@ -1,3 +1,7 @@ +%global appid luisbocanegra.kdematerialyou.colors +%global developer "Luis Bocanegra" +%global org "com.github.luisbocanegra" + Name: kde-material-you-colors Version: 2.0.0 Release: 1%?dist @@ -6,6 +10,7 @@ License: GPL-3.0-only URL: https://github.com/luisbocanegra/%{name} # The PyPi source is a more generic install and lacks the Plasmoid config Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +BuildRequires: anda-srpm-macros BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake >= 3.16 @@ -59,6 +64,7 @@ DESTDIR="%{buildroot}" %cmake_install sed -i "1{/^#!\/usr\/bin\/env python3/d}" %{buildroot}%{python3_sitelib}/kde_material_you_colors/main.py %fdupes %{buildroot}%{python3_sitelib}/%{name}/ +%terra_appstream %files %doc CHANGELOG.md @@ -66,7 +72,7 @@ sed -i "1{/^#!\/usr\/bin\/env python3/d}" %{buildroot}%{python3_sitelib}/kde_mat %license LICENSE %{_bindir}/%{name}-screenshot-helper %{_datadir}/applications/%{name}-screenshot-helper.desktop -%{_datadir}/metainfo/luisbocanegra.kdematerialyou.colors.appdata.xml +%{_metainfodir}/luisbocanegra.kdematerialyou.colors.metainfo.xml %{_datadir}/plasma/plasmoids/luisbocanegra.kdematerialyou.colors/ %files -n python3-%{name} diff --git a/anda/themes/kde-material-you-colors/update.rhai b/anda/themes/kde-material-you-colors/update.rhai index 7d94a6b1d0..15f1da3f44 100644 --- a/anda/themes/kde-material-you-colors/update.rhai +++ b/anda/themes/kde-material-you-colors/update.rhai @@ -1 +1,11 @@ +import "andax/bump_extras.rhai" as bump; + rpm.version(pypi("kde-material-you-colors")); + +open_file("anda/themes/kde-material-you-colors/VERSION_qt6-qtbase.txt", "w").write(bump::bodhi("qt6-qtbase", bump::as_bodhi_ver(labels.branch))); + +let dir = sub(`/[^/]+$`, "", __script_path); +if sh("[[ `git status " + dir + " --porcelain` ]] && exit 1 || exit 0", #{}).ctx.rc == 1 { + let rel = spec::get_release(rpm).parse_int(); + rpm.release(rel + 1); +}