From e8ba81ee39db77d05690e35874e8afe73bb3ca75fd412f5d032fce1ae9e10f35 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Mon, 3 Oct 2022 05:46:14 +0000 Subject: [PATCH] Accepting request 1007600 from home:MargueriteSu:branches:X11:Cinnamon:Factory - add FTBFS-setuptools-61.0.patch OBS-URL: https://build.opensuse.org/request/show/1007600 OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=71 --- FTBFS-setuptools-61.0.patch | 12 ++++++++++++ nemo-extensions.changes | 5 +++++ nemo-extensions.spec | 12 ++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 FTBFS-setuptools-61.0.patch diff --git a/FTBFS-setuptools-61.0.patch b/FTBFS-setuptools-61.0.patch new file mode 100644 index 0000000..50c26a0 --- /dev/null +++ b/FTBFS-setuptools-61.0.patch @@ -0,0 +1,12 @@ +Index: nemo-extensions-5.2.0/nemo-emblems/setup.py +=================================================================== +--- nemo-extensions-5.2.0.orig/nemo-emblems/setup.py ++++ nemo-extensions-5.2.0/nemo-emblems/setup.py +@@ -22,6 +22,7 @@ from setuptools import setup + + # Setup stage + setup( ++ packages = [], + name = "nemo-emblems", + version = "5.2.0", + description = "Change your folder and file emblems", diff --git a/nemo-extensions.changes b/nemo-extensions.changes index 062bd75..10435fc 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 3 02:50:43 UTC 2022 - Marguerite Su + +- add FTBFS-setuptools-61.0.patch + ------------------------------------------------------------------- Wed May 18 06:20:05 UTC 2022 - Steve Kowalik diff --git a/nemo-extensions.spec b/nemo-extensions.spec index b72059e..ef7a84a 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -30,6 +30,8 @@ URL: https://github.com/linuxmint/nemo-extensions Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM nemo-share-prevent-privilege-escalation.patch bsc#1084703 -- Prevent unprivileged users from adding other users to sambashare (commit a831e7b). Patch4: nemo-share-prevent-privilege-escalation.patch +# PATCH-FIX-UPSTREAM FTBFS-setuptools-61.0.patch -- fix build with setuptools 61.0 +Patch5: FTBFS-setuptools-61.0.patch BuildRequires: fdupes BuildRequires: gettext-runtime BuildRequires: gnome-common @@ -482,6 +484,10 @@ rm -r %{buildroot}%{_datadir}/nemo-share/install-samba # Already included. rm -r %{buildroot}%{_datadir}/licenses/nemo-dropbox/COPYING +%python_compileall +rm -rf %{buildroot}%{_datadir}/nemo-compare/utils.py +ln -sf %{python3_sitelib}/utils.py %{buildroot}%{_datadir}/nemo-compare/utils.py + %if 0%{?suse_version} >= 1500 %post -n python3-nemo -p /sbin/ldconfig %postun -n python3-nemo -p /sbin/ldconfig @@ -547,6 +553,9 @@ rm -r %{buildroot}%{_datadir}/licenses/nemo-dropbox/COPYING %{_datadir}/nemo-compare/ %{python3_sitelib}/nemo_compare-%{version}-py?.*.egg-info %{_datadir}/nemo-python/extensions/nemo-compare.py +%{python3_sitelib}/utils.py +%{python3_sitelib}/__pycache__/utils.cpython-%{python_version_nodots}.opt-1.pyc +%{python3_sitelib}/__pycache__/utils.cpython-%{python_version_nodots}.pyc %files -n nemo-extension-dropbox %license nemo-dropbox/COPYING @@ -625,5 +634,8 @@ rm -r %{buildroot}%{_datadir}/licenses/nemo-dropbox/COPYING %{_datadir}/nemo-python/extensions/nemo_terminal.py %{_datadir}/glib-2.0/schemas/org.nemo.extensions.nemo-terminal.gschema.xml %{python3_sitelib}/nemo_terminal-%{version}-py?.*.egg-info +%{python3_sitelib}/nemo_terminal.py +%{python3_sitelib}/__pycache__/nemo_terminal.cpython-%{python_version_nodots}.opt-1.pyc +%{python3_sitelib}/__pycache__/nemo_terminal.cpython-%{python_version_nodots}.pyc %changelog