OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=36

nemo-extensions.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Sep 10 16:00:33 UTC 2017 - sor.alexei@meowr.ru
+
+- Add nemo-seahorse_gpg-2.2.patch: Add GPG 2.2 to accepted versions
+  in nemo-seahorse.
+
 -------------------------------------------------------------------
 Sun May  7 11:23:03 UTC 2017 - sor.alexei@meowr.ru
 

nemo-extensions.spec

@@ -24,16 +24,18 @@ Name:           nemo-extensions
 Version:        3.4.0
 Release:        0
 Summary:        Set of extensions for Nemo, the Cinnamon file manager
-License:        GPL-2.0 and GPL-3.0 and GPL-3.0+
+License:        GPL-2.0 AND GPL-3.0 AND GPL-3.0+
 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-OPENSUSE nemo-seahorse_no-nautilus-conflicts.patch sor.alexei@meowr.ru -- Strip conflicted with nautilus-extension-seahorse files.
 Patch0:         nemo-seahorse_no-nautilus-conflicts.patch
-# PATCH-FIX-OPENSUSE nemo-dropbox_no-dropbox-bin.patch sor.alexei@meowr.ru -- Strip dropbox binary installation.
+# PATCH-FIX-OPENSUSE nemo-dropbox_no-dropbox-bin.patch sor.alexei@meowr.ru -- Strip dropbox binary installation from nemo-dropbox.
 Patch1:         nemo-dropbox_no-dropbox-bin.patch
-# PATCH-FIX-OPENSUSE nemo-gtkhash_mbedtls-2.x.patch sor.alexei@meowr.ru -- Add mbed TLS 2.x+ support.
+# PATCH-FIX-OPENSUSE nemo-gtkhash_mbedtls-2.x.patch sor.alexei@meowr.ru -- Add mbed TLS 2.x+ support to nemo-gtkhash.
 Patch2:         nemo-gtkhash_mbedtls-2.x.patch
+# PATCH-FIX-OPENSUSE nemo-seahorse_gpg-2.2.patch sor.alexei@meowr.ru -- Add GPG 2.2 to accepted versions in nemo-seahorse.
+Patch3:         nemo-seahorse_gpg-2.2.patch
 BuildRequires:  gettext-runtime
 BuildRequires:  gnome-common
 BuildRequires:  intltool
@@ -354,6 +356,7 @@ directory in Nemo.
 %patch0
 %patch1
 %patch2
+%patch3
 # Remove spurious executable permission.
 chmod a-x nemo-audio-tab/COPYING.GPL3 nemo-emblems/COPYING.GPL3
 
@@ -520,7 +523,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %glib2_gsettings_schema_postun
 
 %files -n python-nemo
-%defattr(-,root,root)
 %doc nemo-python/AUTHORS nemo-python/COPYING nemo-python/debian/changelog
 %doc %{_docdir}/nemo-python/
 %{_libdir}/nemo/extensions-3.0/libnemo-python.so
@@ -529,13 +531,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %dir %{_datadir}/nemo-python/extensions/
 
 %files -n nemo-extension-audio-tab
-%defattr(-,root,root)
 %doc nemo-audio-tab/COPYING* nemo-audio-tab/debian/changelog
 %{_datadir}/nemo-python/extensions/nemo-audio-tab.*
 %{python_sitelib}/nemo_audio_tab-*
 
 %files -n nemo-extension-compare
-%defattr(-,root,root)
 %doc nemo-compare/nemo-compare/COPYING* nemo-compare/debian/changelog
 %{_bindir}/nemo-compare-preferences
 %{_datadir}/nemo-compare/
@@ -544,29 +544,23 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_mandir}/man1/nemo-compare-preferences.1%{?ext_man}
 
 %files -n nemo-extension-compare-lang -f nemo-compare.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-dropbox
-%defattr(-,root,root)
 %doc nemo-dropbox/AUTHORS nemo-dropbox/COPYING nemo-dropbox/debian/changelog
 %{_libdir}/nemo/extensions-3.0/libnemo-dropbox.so
 
 %files -n nemo-extension-emblems
-%defattr(-,root,root)
 %doc nemo-emblems/COPYING* nemo-emblems/debian/changelog
 %{_datadir}/nemo-python/extensions/nemo-emblems.py
 %{python_sitelib}/nemo_emblems-*
 
 %files -n nemo-extension-emblems-lang -f nemo-emblems.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-fileroller
-%defattr(-,root,root)
 %doc nemo-fileroller/COPYING nemo-fileroller/debian/changelog
 %{_libdir}/nemo/extensions-3.0/libnemo-fileroller.so
 
 %files -n nemo-extension-gtkhash
-%defattr(-,root,root)
 %doc nemo-gtkhash/AUTHORS nemo-gtkhash/COPYING nemo-gtkhash/debian/changelog
 %{_bindir}/gtkhash
 %{_libdir}/nemo/extensions-3.0/libgtkhash-properties.so
@@ -574,19 +568,15 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/glib-2.0/schemas/*gtkhash*.gschema.xml
 
 %files -n nemo-extension-gtkhash-lang -f nemo-gtkhash.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-image-converter
-%defattr(-,root,root)
 %doc nemo-image-converter/AUTHORS nemo-image-converter/COPYING nemo-image-converter/debian/changelog
 %{_libdir}/nemo/extensions-3.0/libnemo-image-converter.so
 %{_datadir}/nemo-image-converter/
 
 %files -n nemo-extension-image-converter-lang -f nemo-image-converter.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-pastebin
-%defattr(-,root,root)
 %doc nemo-pastebin/COPYING nemo-pastebin/debian/changelog
 %{_bindir}/nemo-pastebin.py
 %{_bindir}/nemo-pastebin-configurator.py
@@ -597,10 +587,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/glib-2.0/schemas/nemo-pastebin.gschema.xml
 
 %files -n nemo-extension-pastebin-lang -f nemo-pastebin.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-preview
-%defattr(-,root,root)
 %doc nemo-preview/AUTHORS nemo-preview/COPYING nemo-preview/debian/changelog
 %{_bindir}/nemo-preview
 %{_libexecdir}/nemo-preview-start
@@ -609,42 +597,33 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/dbus-1/services/org.nemo.Preview.service
 
 %files -n nemo-extension-preview-lang -f nemo-preview.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-rabbitvcs
-%defattr(-,root,root)
 %doc nemo-rabbitvcs/AUTHORS nemo-rabbitvcs/COPYING nemo-rabbitvcs/debian/changelog
 %{_datadir}/nemo-python/extensions/RabbitVCS.py
 
 %files -n nemo-extension-repairer
-%defattr(-,root,root)
 %doc nemo-repairer/AUTHORS nemo-repairer/COPYING nemo-repairer/COPYING nemo-repairer/README
 %{_bindir}/nemo-filename-repairer
 %{_libdir}/nemo/extensions-3.0/libnemo-filename-repairer.so
 %{_datadir}/nemo-filename-repairer/
 
 %files -n nemo-extension-repairer-lang -f nemo-filename-repairer.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-seahorse
-%defattr(-,root,root)
 %doc nemo-seahorse/COPYING nemo-seahorse/debian/changelog
 %{_libdir}/nemo/extensions-3.0/libnemo-seahorse.so
 
 %files -n nemo-extension-seahorse-lang -f nemo-seahorse.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-share
-%defattr(-,root,root)
 %doc nemo-share/AUTHORS nemo-share/COPYING nemo-share/debian/changelog
 %{_libdir}/nemo/extensions-3.0/libnemo-share.so
 %{_datadir}/nemo-share/
 
 %files -n nemo-extension-share-lang -f nemo-share.lang
-%defattr(-,root,root)
 
 %files -n nemo-extension-terminal
-%defattr(-,root,root)
 %doc nemo-terminal/AUTHORS nemo-terminal/COPYING nemo-terminal/debian/changelog
 %{_datadir}/nemo-terminal/
 %{_datadir}/nemo-python/extensions/nemo_terminal.py

nemo-seahorse_gpg-2.2.patch

@@ -0,0 +1,11 @@
+--- nemo-seahorse.orig/configure.ac
++++ nemo-seahorse/configure.ac
+@@ -57,7 +57,7 @@ AC_ARG_ENABLE(gpg-check,
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0 2.1"
++	accepted_versions="1.2 1.4 2.0 2.1 2.2"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	ok="no"
+ 	if test "$GNUPG" != "no"; then