From 7e750e65c049df5e902a9f18bbba0d8c70fa9c4b Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 25 Jun 2024 13:17:44 -0700 Subject: [PATCH 1/4] chore: Add spec files for python-fuse --- .../python-fuse/no-more-distutils.patch | 29 ++++++++++ spec_files/python-fuse/python-fuse.spec | 57 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 spec_files/python-fuse/no-more-distutils.patch create mode 100644 spec_files/python-fuse/python-fuse.spec diff --git a/spec_files/python-fuse/no-more-distutils.patch b/spec_files/python-fuse/no-more-distutils.patch new file mode 100644 index 00000000..a8d6c115 --- /dev/null +++ b/spec_files/python-fuse/no-more-distutils.patch @@ -0,0 +1,29 @@ +From 24039401245c6ba3bfb991e690a8ad85480845a4 Mon Sep 17 00:00:00 2001 +From: Steve Kowalik +Date: Tue, 16 Jan 2024 15:43:17 +1100 +Subject: [PATCH] Do not unilaterally import distutils in setup.py + +Python 3.12 removed distutils completly, so also attempt to import +Extension from setuptools, and if that fails, to import it from +distutils. +--- + setup.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 1d420b8..292ea8f 100755 +--- a/setup.py ++++ b/setup.py +@@ -7,10 +7,9 @@ + # part of the icecast project, http://svn.xiph.org/icecast/trunk/shout-python) + + try: +- from setuptools import setup ++ from setuptools import setup, Extension + except ImportError: +- from distutils.core import setup +-from distutils.core import Extension ++ from distutils.core import setup, Extension + import os + import sys + diff --git a/spec_files/python-fuse/python-fuse.spec b/spec_files/python-fuse/python-fuse.spec new file mode 100644 index 00000000..9780bf84 --- /dev/null +++ b/spec_files/python-fuse/python-fuse.spec @@ -0,0 +1,57 @@ +# +# spec file for package python-fuse +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + +Name: python-fuse +Version: 1.0.7 +Release: 0 +Summary: Python bindings for FUSE +License: LGPL-2.1-only +URL: https://github.com/libfuse/python-fuse +Source: https://github.com/libfuse/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM gh#libfuse/python-fuse#58 +Patch0: no-more-distutils.patch +BuildRequires: python3-devel +BuildRequires: python3-pip +BuildRequires: python3-setuptools +BuildRequires: python3-wheel +BuildRequires: fdupes +BuildRequires: fuse-devel +BuildRequires: pkgconfig +BuildRequires: python-rpm-macros +BuildRequires: gcc + +%description +Python bindings for FUSE (User space File System) + +%prep +%autosetup -p1 + +%build +%pyproject_wheel + +%install +%pyproject_install + +%files +%license COPYING +%doc README.* FAQ AUTHORS +%{python3_sitearch}/fuse.py +%{python3_sitearch}/__pycache__ +%{python3_sitearch}/fuseparts +%{python3_sitearch}/fuse_python-%{version}.dist-info + +%changelog From 8914464dd8c654957e583c081e91ae9bcd4e4963 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 25 Jun 2024 13:45:30 -0700 Subject: [PATCH 2/4] chore: Adjust pycache inclusion --- spec_files/python-fuse/python-fuse.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec_files/python-fuse/python-fuse.spec b/spec_files/python-fuse/python-fuse.spec index 9780bf84..2000c2dc 100644 --- a/spec_files/python-fuse/python-fuse.spec +++ b/spec_files/python-fuse/python-fuse.spec @@ -50,7 +50,7 @@ Python bindings for FUSE (User space File System) %license COPYING %doc README.* FAQ AUTHORS %{python3_sitearch}/fuse.py -%{python3_sitearch}/__pycache__ +%{python3_sitearch}/__pycache__/fuse*.py* %{python3_sitearch}/fuseparts %{python3_sitearch}/fuse_python-%{version}.dist-info From baa0993191b3af3ee5103b29e6cdac8e629c8fdd Mon Sep 17 00:00:00 2001 From: Pat Connors <121328689+nicknamenamenick@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:51:19 -0400 Subject: [PATCH 3/4] chore(readme): Clarify downloads on website... (#1282) ...not releases page anymore. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 36ff93f5..b89ea21e 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ Common variant available as `bazzite`, suitable for desktop computers. - Automatic updates for the OS, Flatpaks, and all Distrobox containers - powered by [ublue-update](https://github.com/ublue-os/ublue-update) and [topgrade](https://github.com/topgrade-rs/topgrade). > [!IMPORTANT] -> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** +> **ISOs can be downloaded from our [website](https://download.bazzite.gg), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** Rebase from an existing upstream Fedora Atomic to this image if you want **Open Source GPU Drivers**: (Please note: Mesa's Open Source option for NVIDIA GPUs, NVK is still prone to errors at the time of writing, for any issues relating to NVK [please submit a report with Mesa]([url](https://docs.mesa3d.org/bugs.html)), not Ublue/Bazzite) @@ -139,7 +139,7 @@ Variant designed for usage as an alternative to SteamOS on the Steam Deck, and f > **Due to an upstream bug, Bazzite cannot be used on Steam Decks with 64GB eMMC storage at this time. Upgrading the storage resolves the issue.** > [!IMPORTANT] -> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** +> **ISOs can be downloaded from our [website](https://download.bazzite.gg), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** Rebase from an existing upstream Fedora Atomic to this image: @@ -186,7 +186,7 @@ Builds with the GNOME desktop environment are available in both desktop and deck - Automatic updates for the [Firefox GNOME theme](https://github.com/rafaelmardojai/firefox-gnome-theme) and [Thunderbird GNOME theme](https://github.com/rafaelmardojai/thunderbird-gnome-theme). (If installed) > [!IMPORTANT] -> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** +> **ISOs can be downloaded from our [website](https://download.bazzite.gg), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** Rebase from an existing upstream Fedora Atomic to this image: From d6ec805f0d911e4abc2a52993c2f17cc4f48cd23 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 26 Jun 2024 14:57:16 -0700 Subject: [PATCH 4/4] Revert "chore: Add spec files for python-fuse" This reverts commit 7e750e65c049df5e902a9f18bbba0d8c70fa9c4b. --- .../python-fuse/no-more-distutils.patch | 29 ---------- spec_files/python-fuse/python-fuse.spec | 57 ------------------- 2 files changed, 86 deletions(-) delete mode 100644 spec_files/python-fuse/no-more-distutils.patch delete mode 100644 spec_files/python-fuse/python-fuse.spec diff --git a/spec_files/python-fuse/no-more-distutils.patch b/spec_files/python-fuse/no-more-distutils.patch deleted file mode 100644 index a8d6c115..00000000 --- a/spec_files/python-fuse/no-more-distutils.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 24039401245c6ba3bfb991e690a8ad85480845a4 Mon Sep 17 00:00:00 2001 -From: Steve Kowalik -Date: Tue, 16 Jan 2024 15:43:17 +1100 -Subject: [PATCH] Do not unilaterally import distutils in setup.py - -Python 3.12 removed distutils completly, so also attempt to import -Extension from setuptools, and if that fails, to import it from -distutils. ---- - setup.py | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 1d420b8..292ea8f 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,10 +7,9 @@ - # part of the icecast project, http://svn.xiph.org/icecast/trunk/shout-python) - - try: -- from setuptools import setup -+ from setuptools import setup, Extension - except ImportError: -- from distutils.core import setup --from distutils.core import Extension -+ from distutils.core import setup, Extension - import os - import sys - diff --git a/spec_files/python-fuse/python-fuse.spec b/spec_files/python-fuse/python-fuse.spec deleted file mode 100644 index 2000c2dc..00000000 --- a/spec_files/python-fuse/python-fuse.spec +++ /dev/null @@ -1,57 +0,0 @@ -# -# spec file for package python-fuse -# -# Copyright (c) 2024 SUSE LLC -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - -Name: python-fuse -Version: 1.0.7 -Release: 0 -Summary: Python bindings for FUSE -License: LGPL-2.1-only -URL: https://github.com/libfuse/python-fuse -Source: https://github.com/libfuse/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gh#libfuse/python-fuse#58 -Patch0: no-more-distutils.patch -BuildRequires: python3-devel -BuildRequires: python3-pip -BuildRequires: python3-setuptools -BuildRequires: python3-wheel -BuildRequires: fdupes -BuildRequires: fuse-devel -BuildRequires: pkgconfig -BuildRequires: python-rpm-macros -BuildRequires: gcc - -%description -Python bindings for FUSE (User space File System) - -%prep -%autosetup -p1 - -%build -%pyproject_wheel - -%install -%pyproject_install - -%files -%license COPYING -%doc README.* FAQ AUTHORS -%{python3_sitearch}/fuse.py -%{python3_sitearch}/__pycache__/fuse*.py* -%{python3_sitearch}/fuseparts -%{python3_sitearch}/fuse_python-%{version}.dist-info - -%changelog