diff --git a/nemo-extensions.changes b/nemo-extensions.changes index 644a063..fdf96aa 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Aug 6 14:09:43 UTC 2018 - sor.alexei@meowr.ru -- Add nemo-share-3.8.0-prevent-privilege-escalation.patch: Prevent +- Add nemo-share-prevent-privilege-escalation.patch: Prevent unprivileged users from adding other users to sambashare (commit a831e7b, bsc#1084703). diff --git a/nemo-extensions.spec b/nemo-extensions.spec index ba0dddd..a1e64bd 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -36,8 +36,8 @@ Patch1: nemo-dropbox_no-dropbox-bin.patch Patch2: nemo-seahorse_gpg-2.2.patch # PATCH-FIX-OPENSUSE nemo-gtkhash_openssl-1.1.patch sor.alexei@meowr.ru -- Add basic OpenSSL 1.1+ compatibility in nemo-gtkhash. Patch3: nemo-gtkhash_openssl-1.1.patch -# PATCH-FIX-UPSTREAM nemo-share-3.8.0-prevent-privilege-escalation.patch bsc#1084703 -- Prevent unprivileged users from adding other users to sambashare (commit a831e7b). -Patch4: nemo-share-3.8.0-prevent-privilege-escalation.patch +# 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 BuildRequires: gettext-runtime BuildRequires: gnome-common BuildRequires: intltool @@ -53,9 +53,6 @@ BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: python-gtk-devel -BuildRequires: python2-distutils-extra -BuildRequires: python2-docutils -BuildRequires: python2-setuptools BuildRequires: update-desktop-files BuildRequires: pkgconfig(cinnamon-desktop) BuildRequires: pkgconfig(cjs-1.0) @@ -78,6 +75,15 @@ BuildRequires: pkgconfig(pygobject-3.0) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(xreader-document-1.5) BuildRequires: pkgconfig(xreader-view-1.5) +%if 0%{?suse_version} >= 1500 +BuildRequires: python2-distutils-extra +BuildRequires: python2-docutils +BuildRequires: python2-setuptools +%else +BuildRequires: python-distutils-extra +BuildRequires: python-docutils +BuildRequires: python-setuptools +%endif %description Set of extensions for Nemo, the Cinnamon file manager. @@ -94,7 +100,6 @@ Requires: nemo >= %{_version} # nemo-python was last used in openSUSE 13.2. Provides: nemo-python = %{version} Obsoletes: nemo-python < %{version} - %if 0%{?suse_version} >= 1500 Provides: python2-nemo-devel = %{version} # python-nemo was last used in openSUSE Leap 42.3. diff --git a/nemo-share-3.8.0-prevent-privilege-escalation.patch b/nemo-share-prevent-privilege-escalation.patch similarity index 100% rename from nemo-share-3.8.0-prevent-privilege-escalation.patch rename to nemo-share-prevent-privilege-escalation.patch