From f849f1c65149a46430eec8fb26e42b13c9ae00be Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 20 Jun 2025 04:19:45 -0700 Subject: [PATCH] chore: Update some more Python packages (#5584) (#5586) * chore: Update some more Python packages * fix: What the heck? * fix: Okay this is VERY weird * fix: This Wheel is cursed * fix: Cursed typo * fix: How did it even let me do that * fix: CURSED WHEEL * fix: -f * fix: Okay * fix: ??? * What now * fix: Python path (cherry picked from commit 6de45dc20b6ad172b676dfbf17298ce8d07c42a4) Co-authored-by: Gilver --- .../lomiri-unity/unity-shell/unity-shell.spec | 17 ++++++++++++-- anda/desktops/mate/tweak/mate-tweak.spec | 23 +++++++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/anda/desktops/lomiri-unity/unity-shell/unity-shell.spec b/anda/desktops/lomiri-unity/unity-shell/unity-shell.spec index db0267dd2e..b8816bd7b5 100644 --- a/anda/desktops/lomiri-unity/unity-shell/unity-shell.spec +++ b/anda/desktops/lomiri-unity/unity-shell/unity-shell.spec @@ -21,7 +21,7 @@ BuildRequires: pkgconfig(zeitgeist-2.0) BuildRequires: libappstream-glib-devel BuildRequires: libdbusmenu-devel BuildRequires: bamf-devel -BuildRequires: terra-libindicator-gtk3-devel +BuildRequires: libindicator-gtk3-devel BuildRequires: json-glib-devel BuildRequires: libnotify-devel BuildRequires: libsigc++20-devel @@ -30,6 +30,7 @@ BuildRequires: doxygen BuildRequires: pam-devel BuildRequires: boost-devel BuildRequires: python3-devel +BuildRequires: python3-pip BuildRequires: python3-setuptools BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(nux-4.0) @@ -47,7 +48,7 @@ Requires: pam Requires: bamf-daemon Requires: unity-gtk-module-common Requires: compiz9 -Requires: terra-libindicator-gtk3 +Requires: libindicator-gtk3 Recommends: unity-greeter Recommends: unity-scope-home @@ -115,12 +116,20 @@ sed -i '/libgeis/d' CMakeLists.txt %cmake_build pushd uwidgets/ +%if 0%{?fedora} <= 41 %py3_build +%else +%pyproject_wheel +%endif popd %install pushd uwidgets/ +%if 0%{?fedora} <= 41 %py3_install +%else +%pyproject_install +%endif popd %cmake_install @@ -222,7 +231,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %doc README %license uwidgets/LICENCE %{_bindir}/uwidgets-runner +%if 0%{?fedora} <= 41 %{python3_sitearch}/uwidgets-*.egg-info/ +%else +%{python3_sitearch}/uwidgets-*.dist-info/ +%endif %{python3_sitearch}/uwidgets/ %changelog diff --git a/anda/desktops/mate/tweak/mate-tweak.spec b/anda/desktops/mate/tweak/mate-tweak.spec index 3a84b0eea5..f7dfeb93db 100644 --- a/anda/desktops/mate/tweak/mate-tweak.spec +++ b/anda/desktops/mate/tweak/mate-tweak.spec @@ -8,7 +8,7 @@ License: GPL-2.0 URL: https://github.com/ubuntu-mate/mate-tweak Source0: %url/archive/refs/tags/%version.tar.gz Requires: python3 -BuildRequires: python3dist(setuptools) rpm_macro(py3_build) intltool desktop-file-utils +BuildRequires: python3dist(setuptools) python3-devel python3dist(pip) intltool desktop-file-utils %description This is MATE Tweak, a fork of mintDesktop. @@ -19,10 +19,21 @@ python3 -m ensurepip python3 -m pip install distutils-extra-python %build +%if 0%{?fedora} <= 41 %py3_build +%else +%pyproject_wheel +%endif %install +%if 0%{?fedora} <= 41 %py3_install +%else +%pyproject_install +desktop-file-install data/*.desktop +cp -r %{buildroot}%{python3_sitelib}%{_prefix} -t %{buildroot} --preserve=all +rm -rf %{buildroot}%{python3_sitelib}%{_prefix} +%endif %check desktop-file-validate %buildroot%_datadir/applications/*.desktop @@ -39,9 +50,13 @@ desktop-file-validate %buildroot%_datadir/applications/*.desktop %_datadir/applications/%name.desktop %_datadir/applications/marco-{glx,no-composite,xr_glx_hybrid,xrender}.desktop %_datadir/polkit-1/actions/org.mate.%name.policy -%ghost %_prefix/lib/python3.*/site-packages/__pycache__ -%ghost %_prefix/lib/python3.*/site-packages/setup.py -%ghost %_prefix/lib/python3.*/site-packages/mate_tweak-%version-py3.*.egg-info/ +%{python3_sitelib}/__pycache__/ +%{python3_sitelib}/setup.py +%if 0%{?fedora} <= 41 +%{python3_sitelib}/mate_tweak-%version-py3.*.egg-info/ +%else +%{python3_sitelib}/mate_tweak-%{version}.dist-info/ +%endif %changelog %autochangelog