rpm/nemo-extensions
SHA256
1
0
Fork 0
forked from pool/nemo-extensions
Code Pull Requests Activity

Accepting request 1130593 from home:MargueriteSu:branches:X11:Cinnamon:Factory

Browse Source 
- update to version 6.0.0
  * build and example fixes
- drop nemo-share-prevent-privilege-escalation.patch, upstreamed
- drop FTBFS-setuptools-61.0.patch, that extension disappeared

OBS-URL: https://build.opensuse.org/request/show/1130593
OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=75
This commit is contained in:
Marguerite Su 2023-12-03 14:34:36 +00:00 committed by Git OBS Bridge
parent 2bca42e497
commit 22f130154a
7 changed files with 34 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FTBFS-setuptools-61.0.patch
View File

@ -1,12 +0,0 @@
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",

21
fix-hwcaps.patch
View File

@ -1,28 +1,27 @@
Index: nemo-extensions-5.2.0/nemo-python/meson.build
Index: nemo-extensions-6.0.0/nemo-python/meson.build
===================================================================
--- nemo-extensions-5.2.0.orig/nemo-python/meson.build
+++ nemo-extensions-5.2.0/nemo-python/meson.build
@@ -39,6 +39,8 @@ pyextdir = join_paths(get_option('prefix
--- nemo-extensions-6.0.0.orig/nemo-python/meson.build
+++ nemo-extensions-6.0.0/nemo-python/meson.build
@@ -40,6 +40,7 @@ pyextdir = join_paths(get_option('prefix
cdata.set_quoted('NEMO_EXTENSION_DIR', nemo.get_pkgconfig_variable('extensiondir'))
cdata.set_quoted('NEMO_EXTENSION_DIR', nemo.get_variable(pkgconfig: 'extensiondir'))
cdata.set_quoted('PYTHON_LIBPATH', libpath)
+cdata.set_quoted('PYTHON_LIBNAME', python3.get_variable('INSTSONAME'))
+
cdata.set('PYGOBJECT_MAJOR_VERSION', 3)
cdata.set('PYGOBJECT_MINOR_VERSION', 0)
cdata.set('PYGOBJECT_MICRO_VERSION', 0)
Index: nemo-extensions-5.2.0/nemo-python/src/nemo-python.c
Index: nemo-extensions-6.0.0/nemo-python/src/nemo-python.c
===================================================================
--- nemo-extensions-5.2.0.orig/nemo-python/src/nemo-python.c
+++ nemo-extensions-5.2.0/nemo-python/src/nemo-python.c
--- nemo-extensions-6.0.0.orig/nemo-python/src/nemo-python.c
+++ nemo-extensions-6.0.0/nemo-python/src/nemo-python.c
@@ -175,8 +175,8 @@ nemo_python_init_python (void)
if (Py_IsInitialized())
return TRUE;
- debug("g_module_open " PYTHON_LIBPATH);
- libpython = g_module_open(PYTHON_LIBPATH, 0);
+ debug("g_module_open " PYTHON_LIBNAME);
+ libpython = g_module_open (PYTHON_LIBNAME, 0);
+ debug("g_module_open " PYTHON_LIBNAME);
+ libpython = g_module_open(PYTHON_LIBNAME, 0);
if (!libpython)
g_warning("g_module_open libpython failed: %s", g_module_error());

3
nemo-extensions-5.2.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5
size 533607

3
nemo-extensions-6.0.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82
size 536418

8
nemo-extensions.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Dec 2 04:18:40 UTC 2023 - Marguerite Su <i@marguerite.su>
- update to version 6.0.0
* build and example fixes
- drop nemo-share-prevent-privilege-escalation.patch, upstreamed
- drop FTBFS-setuptools-61.0.patch, that extension disappeared
-------------------------------------------------------------------
Tue Jul 11 06:10:53 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>

29
nemo-extensions.spec
View File

@ -19,21 +19,18 @@
# Do not package nemo-extension-media-columns for now: slows Nemo down.
# nemo-extension-terminal 'requires' two versions, confusing typelib finder.
%define __requires_exclude typelib\\((Vte))\ =
%define _version 5.0.0
%define _version 6.0.0
Name: nemo-extensions
Version: 5.2.0
Version: 6.0.0
Release: 0
Summary: Set of extensions for Nemo, the Cinnamon file manager
License: GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later
Group: System/GUI/Other
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
# PATCH-FIX-OPENSUSE fix-hwcaps.patch bsc#1212482
Patch6: fix-hwcaps.patch
#Patch6: fix-hwcaps.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gettext-runtime
BuildRequires: gnome-common
@ -68,7 +65,7 @@ BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(nettle)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(pygobject-3.0)
BuildRequires: pkgconfig(webkit2gtk-4.0)
BuildRequires: pkgconfig(webkit2gtk-4.1)
BuildRequires: pkgconfig(xreader-document-1.5)
BuildRequires: pkgconfig(xreader-view-1.5)
%if 0%{?suse_version} >= 1500
@ -487,8 +484,8 @@ rm -r %{buildroot}%{_datadir}/nemo-share/install-samba
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
#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
@ -555,9 +552,9 @@ ln -sf %{python3_sitelib}/utils.py %{buildroot}%{_datadir}/nemo-compare/utils.py
%{_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
#%{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
@ -636,8 +633,8 @@ ln -sf %{python3_sitelib}/utils.py %{buildroot}%{_datadir}/nemo-compare/utils.py
%{_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
#%{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

18
nemo-share-prevent-privilege-escalation.patch
View File

@ -1,18 +0,0 @@
--- a/nemo-share/src/install-samba 2019-02-08 16:11:14.000000000 +0600
+++ b/nemo-share/src/install-samba 2019-04-29 09:16:24.571726203 +0600
@@ -42,6 +42,15 @@
uid = int(uid)
passwd = pwd.getpwuid(uid)
user = passwd[0]
+ # prefer using the uid provided by pkexec to the command line argument. if
+ # a user authenticated via pkexec then he should only be able to add
+ # himself to the group.
+ uid = os.getenv("PKEXEC_UID", None)
+
+ if uid != None:
+ uid = int(uid)
+ passwd = pwd.getpwuid(uid)
+ user = passwd[0]
elif len(sys.argv) == 2:
user = sys.argv[1]
else: