Hello community, here is the log from the commit of package nemo-extensions for openSUSE:Factory checked in at 2018-05-11 09:15:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo-extensions (Old) and /work/SRC/openSUSE:Factory/.nemo-extensions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo-extensions" Fri May 11 09:15:45 2018 rev:11 rq:605840 version:3.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nemo-extensions/nemo-extensions.changes 2018-01-01 22:31:04.671183367 +0100 +++ /work/SRC/openSUSE:Factory/.nemo-extensions.new/nemo-extensions.changes 2018-05-11 09:16:05.971244600 +0200 @@ -1,0 +2,34 @@ +Thu May 8 20:40:20 UTC 2018 - [email protected] + +- Update to version 3.8.0 (changes since 3.6.0): + * nemo-preview: Update versioning of xreader libs and + introspection. + * Remove rabbitvcs extension. + The rabbitvcs people are willing to maintain this themselves, + further improvements should be directed there. + * nemo-preview: Fix a gtk warning. + * nemo-preview: ES6 standard: Any symbols to be exported from a + module must be defined with "var". + * nemo-python: Improve gi.require_version() adding. + * nemo-compare: Change from python to python2 in shebangs. + * nemo-media-columns.py: Use a valid enum value, SUCCESS does not + exist. + * nemo-python: Fill info provider handles with a dummy struct to + ensure we have a unique pointer to pass around. + * nemo-media-columns: Use a dictionary keyed to the handle for + tracking source ids. + * nemo-media-columns: Move from python-imaging to python-pil. + * nemo-python: Fix deprecated gnome-common macros/variables. + * nemo-fileroller: Use symbolic icons. + * nemo-dropbox: Add a dropbox symbolic icon. + * nemo-preview: Switch from Apache OpenOffice to LibreOffice. + * nemo-audio-tab: Fixes and optimisations. + * nemo-media-columns: Add track padding. + * nemo-preview: Rename evince.js to xreader.js. + * Update translations. +- Remove nemo-preview_xreader-versioning.patch: fixed upstream. +- Rebase nemo-dropbox_no-dropbox-bin.patch. +- Drop the nemo-extension-rabbitvcs extension. +- Prepare for Meson. + +------------------------------------------------------------------- Old: ---- nemo-extensions-3.6.0.tar.gz nemo-preview_xreader-versioning.patch New: ---- nemo-extensions-3.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo-extensions.spec ++++++ --- /var/tmp/diff_new_pack.BcgysA/_old 2018-05-11 09:16:07.199200113 +0200 +++ /var/tmp/diff_new_pack.BcgysA/_new 2018-05-11 09:16:07.211199678 +0200 @@ -1,7 +1,7 @@ # # spec file for package nemo-extensions # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,14 @@ # 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 3.6.0 +%define _version 3.8.0 Name: nemo-extensions -Version: 3.6.0 +Version: 3.8.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-only AND GPL-3.0-only AND GPL-3.0-or-later Group: System/GUI/Other -Url: https://github.com/linuxmint/nemo-extensions +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 [email protected] -- Strip conflicted with nautilus-extension-seahorse files. Patch0: nemo-seahorse_no-nautilus-conflicts.patch @@ -36,24 +36,24 @@ Patch2: nemo-seahorse_gpg-2.2.patch # PATCH-FIX-OPENSUSE nemo-gtkhash_openssl-1.1.patch [email protected] -- Add basic OpenSSL 1.1+ compatibility in nemo-gtkhash. Patch3: nemo-gtkhash_openssl-1.1.patch -# PATCH-FIX-UPSTREAM nemo-preview_xreader-versioning.patch [email protected] -- Update versioning of xreader libs and introspection in nemo-preview (commit 52767dc). -Patch4: nemo-preview_xreader-versioning.patch BuildRequires: gettext-runtime BuildRequires: gnome-common BuildRequires: intltool BuildRequires: libgcrypt-devel BuildRequires: libgpgme-devel BuildRequires: libtool +BuildRequires: mbedtls-devel BuildRequires: meld +BuildRequires: meson BuildRequires: mhash-devel BuildRequires: nemo-devel BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: python-devel -BuildRequires: python-distutils-extra -BuildRequires: python-docutils BuildRequires: python-gtk-devel -BuildRequires: python-setuptools +BuildRequires: python2-distutils-extra +BuildRequires: python2-docutils +BuildRequires: python2-setuptools BuildRequires: update-desktop-files BuildRequires: pkgconfig(cinnamon-desktop) BuildRequires: pkgconfig(cjs-1.0) @@ -76,54 +76,76 @@ BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(xreader-document-1.5) BuildRequires: pkgconfig(xreader-view-1.5) -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) -BuildRequires: mbedtls-devel -%endif %description Set of extensions for Nemo, the Cinnamon file manager. +%if 0%{?suse_version} >= 1500 +%package -n python2-nemo +%else %package -n python-nemo +%endif Summary: Python bindings for the Nemo File manager -License: GPL-2.0 +License: GPL-2.0-only Group: System/GUI/Other Requires: nemo >= %{_version} -Provides: python-nemo-devel = %{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. +Provides: python-nemo = %{version} +Obsoletes: python-nemo < %{version} + +%description -n python2-nemo +%else +Provides: python-nemo-devel = %{version} + %description -n python-nemo +%endif Includes Python bindings for the Nemo Filemanager. %package -n nemo-extension-audio-tab Summary: Audio tag information for Nemo file manager -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/GUI/Other Requires: nemo >= %{_version} -Requires: python-mutagen -Requires: python-nemo = %{version} Recommends: %{name}-lang BuildArch: noarch +%if 0%{?suse_version} >= 1500 +Requires: python2-mutagen +Requires: python2-nemo = %{version} +%else +Requires: python-mutagen +Requires: python-nemo = %{version} +%endif %description -n nemo-extension-audio-tab View audio tag information from the file manager's properties tab. %package -n nemo-extension-compare Summary: Context Menu comparison extension for Nemo file manager -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/GUI/Other Requires: meld Requires: nemo >= %{_version} -Requires: python-gobject Requires: python-gtk -Requires: python-nemo = %{version} -Requires: python-xdg Recommends: %{name}-lang # nemo-compare was last used in openSUSE 13.2. Provides: nemo-compare = %{version} Obsoletes: nemo-compare < %{version} BuildArch: noarch +%if 0%{?suse_version} >= 1500 +Requires: python2-gobject +Requires: python2-nemo = %{version} +Requires: python2-pyxdg +%else +Requires: python-gobject +Requires: python-nemo = %{version} +Requires: python-xdg +%endif %description -n nemo-extension-compare Simple context menu file comparison extension for Nemo, inspired by @@ -135,7 +157,7 @@ %package -n nemo-extension-dropbox Summary: DropBox support for the Nemo Filemanager -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/GUI/Other Requires: dropbox Requires: nemo >= %{_version} @@ -149,16 +171,19 @@ %package -n nemo-extension-emblems Summary: Change a directory or file emblem in Nemo -License: GPL-3.0 +License: GPL-3.0-only Group: System/GUI/Other Requires: nemo >= %{_version} -Requires: python-gobject Recommends: %{name}-lang # nemo-emblems was last used in openSUSE 13.2. Provides: nemo-emblems = %{version} Obsoletes: nemo-emblems < %{version} BuildArch: noarch -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 +%if 0%{?suse_version} >= 1500 +Requires: python2-gobject +Requires: python2-gobject-Gdk +%else +Requires: python-gobject Requires: python-gobject-Gdk %endif @@ -168,7 +193,7 @@ %package -n nemo-extension-fileroller Summary: Fileroller support for the Nemo Filemanager -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/GUI/Other Requires: file-roller Requires: nemo >= %{_version} @@ -183,7 +208,7 @@ %package -n nemo-extension-gtkhash Summary: Nemo extension for computing checksums and more using gtkhash -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: nemo >= %{_version} Recommends: %{name}-lang @@ -200,7 +225,7 @@ %package -n nemo-extension-image-converter Summary: Nemo extension to mass resize or rotate images -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: ImageMagick Requires: nemo >= %{_version} @@ -217,19 +242,23 @@ %package -n nemo-extension-pastebin Summary: Pastebin extension for Nemo file manager -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: nemo >= %{_version} -Requires: python-gobject -Requires: python-xdg Recommends: %{name}-lang # nemo-pastebin was last used in openSUSE 13.2. Provides: nemo-pastebin = %{version} Obsoletes: nemo-pastebin < %{version} BuildArch: noarch %glib2_gsettings_schema_requires -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 +%if 0%{?suse_version} >= 1500 +Requires: python2-gobject +Requires: python2-gobject-Gdk +Requires: python2-pyxdg +%else +Requires: python-gobject Requires: python-gobject-Gdk +Requires: python-xdg %endif %description -n nemo-extension-pastebin @@ -238,7 +267,7 @@ %package -n nemo-extension-preview Summary: A quick previewer for Nemo file manager -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: gstreamer-plugins-good Requires: nemo >= %{_version} @@ -252,25 +281,9 @@ This is NemoPreview, a quick previewer for Nemo, the Cinnamon desktop file manager. -%package -n nemo-extension-rabbitvcs -Summary: RabbitVCS extension for Nemo file manager -License: GPL-3.0+ -Group: System/GUI/Other -Requires: dbus-1-python -Requires: nemo >= %{_version} -Requires: python-nemo = %{version} -Supplements: packageand(nemo:rabbitvcs) -# nemo-rabbitvcs was last used in openSUSE 13.2. -Obsoletes: nemo-rabbitvcs < %{version} -Provides: nemo-rabbitvcs = %{version} -BuildArch: noarch - -%description -n nemo-extension-rabbitvcs -RabbitVCS extension for Nemo, the Cinnamon desktop file manager. - %package -n nemo-extension-repairer Summary: Nemo extension for filename encoding repair -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: nemo >= %{_version} Recommends: %{name}-lang @@ -289,7 +302,7 @@ %package -n nemo-extension-seahorse Summary: OpenPGP encryption/decryption extension for Nemo file manager -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: nautilus-extension-seahorse >= 3.0 Requires: nemo >= %{_version} @@ -305,7 +318,7 @@ %package -n nemo-extension-share Summary: Samba share extension for Nemo file manager -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: nemo >= %{_version} Recommends: %{name}-lang @@ -321,17 +334,21 @@ %package -n nemo-extension-terminal Summary: Nemo extension to enable an embedded terminal -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/GUI/Other Requires: nemo >= %{_version} -Requires: python-gobject -Requires: python-nemo = %{version} # nemo-terminal was last used in openSUSE 13.2. Provides: nemo-terminal = %{version} Obsoletes: nemo-terminal < %{version} BuildArch: noarch -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 +%if 0%{?suse_version} >= 1500 +Requires: python2-gobject +Requires: python2-gobject-Gdk +Requires: python2-nemo = %{version} +%else +Requires: python-gobject Requires: python-gobject-Gdk +Requires: python-nemo = %{version} %endif %description -n nemo-extension-terminal @@ -346,13 +363,16 @@ %patch1 %patch2 %patch3 -%patch4 # Remove spurious executable permission. chmod a-x nemo-audio-tab/COPYING.GPL3 nemo-emblems/COPYING.GPL3 %build find . -type d -maxdepth 1 -mindepth 1 | while read dir; do pushd "$dir" + if [ -f meson.build ]; then + %meson + %meson_build + fi [ -f autogen.sh ] && NOCONFIGURE=1 ./autogen.sh if [ -f configure ]; then %configure \ @@ -369,14 +389,8 @@ --disable-static \ --enable-linux-crypto \ --enable-libcrypto \ -%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) --enable-gcrypt \ -%else - --disable-gcrypt \ -%endif -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) --enable-mbedtls \ -%endif --enable-nettle \ --enable-nss \ --enable-mhash \ @@ -387,6 +401,9 @@ %install find . -type d -maxdepth 1 -mindepth 1 | while read dir; do pushd "$dir" + if [ -f meson.build ]; then + %meson_install + fi if [ -f Makefile ]; then %make_install fi @@ -417,10 +434,6 @@ ln -s %{_datadir}/nemo-compare/nemo-compare.py %{buildroot}%{_datadir}/nemo-python/extensions/nemo-compare.py ln -s %{_datadir}/nemo-compare/nemo-compare-preferences.py %{buildroot}%{_bindir}/nemo-compare-preferences -# For nemo-extension-rabbitvcs. -install -Dpm 0644 nemo-rabbitvcs/RabbitVCS.py \ - %{buildroot}%{_datadir}/nemo-python/extensions/RabbitVCS.py - # For nemo-extension-terminal. pushd nemo-terminal mkdir -p %{buildroot}%{_datadir}/nemo-terminal/ @@ -440,9 +453,15 @@ find %{buildroot} -type f -name "*.la" -delete -print +%if 0%{?suse_version} >= 1500 +%post -n python2-nemo -p /sbin/ldconfig + +%postun -n python2-nemo -p /sbin/ldconfig +%else %post -n python-nemo -p /sbin/ldconfig %postun -n python-nemo -p /sbin/ldconfig +%endif %post -n nemo-extension-dropbox -p /sbin/ldconfig @@ -472,7 +491,7 @@ %postun -n nemo-extension-share -p /sbin/ldconfig -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post -n nemo-extension-gtkhash /sbin/ldconfig %glib2_gsettings_schema_post @@ -494,8 +513,13 @@ %glib2_gsettings_schema_postun %endif +%if 0%{?suse_version} >= 1500 +%files -n python2-nemo +%else %files -n python-nemo -%doc nemo-python/AUTHORS nemo-python/COPYING nemo-python/debian/changelog +%endif +%license nemo-python/COPYING +%doc nemo-python/AUTHORS nemo-python/debian/changelog %doc %{_docdir}/nemo-python/ %{_libdir}/nemo/extensions-3.0/libnemo-python.so %{_libdir}/pkgconfig/nemo-python.pc @@ -503,44 +527,53 @@ %dir %{_datadir}/nemo-python/extensions/ %files -n nemo-extension-audio-tab -%doc nemo-audio-tab/COPYING* nemo-audio-tab/debian/changelog +%license nemo-audio-tab/COPYING* +%doc nemo-audio-tab/debian/changelog %{_datadir}/nemo-python/extensions/nemo-audio-tab.* %{python_sitelib}/nemo_audio_tab-* %files -n nemo-extension-compare -%doc nemo-compare/nemo-compare/COPYING* nemo-compare/debian/changelog +%license nemo-compare/nemo-compare/COPYING* +%doc nemo-compare/debian/changelog %{_bindir}/nemo-compare-preferences %{_datadir}/nemo-compare/ %{_datadir}/nemo-python/extensions/nemo-compare.py %{_mandir}/man1/nemo-compare-preferences.1%{?ext_man} %files -n nemo-extension-dropbox -%doc nemo-dropbox/AUTHORS nemo-dropbox/COPYING nemo-dropbox/debian/changelog +%license nemo-dropbox/COPYING +%doc nemo-dropbox/AUTHORS nemo-dropbox/debian/changelog %{_libdir}/nemo/extensions-3.0/libnemo-dropbox.so +%{_datadir}/nemo-dropbox/ %files -n nemo-extension-emblems -%doc nemo-emblems/COPYING* nemo-emblems/debian/changelog +%license nemo-emblems/COPYING* +%doc nemo-emblems/debian/changelog %{_datadir}/nemo-python/extensions/nemo-emblems.py %{python_sitelib}/nemo_emblems-* %files -n nemo-extension-fileroller -%doc nemo-fileroller/COPYING nemo-fileroller/debian/changelog +%license nemo-fileroller/COPYING +%doc nemo-fileroller/debian/changelog %{_libdir}/nemo/extensions-3.0/libnemo-fileroller.so %files -n nemo-extension-gtkhash -%doc nemo-gtkhash/AUTHORS nemo-gtkhash/COPYING nemo-gtkhash/debian/changelog +%license nemo-gtkhash/COPYING +%doc nemo-gtkhash/AUTHORS nemo-gtkhash/debian/changelog %{_bindir}/gtkhash %{_libdir}/nemo/extensions-3.0/libgtkhash-properties.so %{_datadir}/nemo-gtkhash/ %{_datadir}/glib-2.0/schemas/*gtkhash*.gschema.xml %files -n nemo-extension-image-converter -%doc nemo-image-converter/AUTHORS nemo-image-converter/COPYING nemo-image-converter/debian/changelog +%license nemo-image-converter/COPYING +%doc nemo-image-converter/AUTHORS nemo-image-converter/debian/changelog %{_libdir}/nemo/extensions-3.0/libnemo-image-converter.so %{_datadir}/nemo-image-converter/ %files -n nemo-extension-pastebin -%doc nemo-pastebin/COPYING nemo-pastebin/debian/changelog +%license nemo-pastebin/COPYING +%doc nemo-pastebin/debian/changelog %{_bindir}/nemo-pastebin.py %{_bindir}/nemo-pastebin-configurator.py %{_datadir}/nemo-pastebin/ @@ -549,35 +582,36 @@ %{_datadir}/glib-2.0/schemas/nemo-pastebin.gschema.xml %files -n nemo-extension-preview -%doc nemo-preview/AUTHORS nemo-preview/COPYING nemo-preview/debian/changelog +%license nemo-preview/COPYING +%doc nemo-preview/AUTHORS nemo-preview/debian/changelog %{_bindir}/nemo-preview %{_libexecdir}/nemo-preview-start %{_libdir}/nemo-preview/ %{_datadir}/nemo-preview/ %{_datadir}/dbus-1/services/org.nemo.Preview.service -%files -n nemo-extension-rabbitvcs -%doc nemo-rabbitvcs/AUTHORS nemo-rabbitvcs/COPYING nemo-rabbitvcs/debian/changelog -%{_datadir}/nemo-python/extensions/RabbitVCS.py - %files -n nemo-extension-repairer -%doc nemo-repairer/AUTHORS nemo-repairer/COPYING nemo-repairer/COPYING nemo-repairer/README +%license nemo-repairer/COPYING +%doc nemo-repairer/AUTHORS nemo-repairer/README %{_bindir}/nemo-filename-repairer %{_libdir}/nemo/extensions-3.0/libnemo-filename-repairer.so %{_datadir}/nemo-filename-repairer/ %files -n nemo-extension-seahorse -%doc nemo-seahorse/COPYING nemo-seahorse/debian/changelog +%license nemo-seahorse/COPYING +%doc nemo-seahorse/debian/changelog %{_libdir}/nemo/extensions-3.0/libnemo-seahorse.so %files -n nemo-extension-share -%doc nemo-share/AUTHORS nemo-share/COPYING nemo-share/debian/changelog +%license nemo-share/COPYING +%doc nemo-share/AUTHORS nemo-share/debian/changelog %{_libdir}/nemo/extensions-3.0/libnemo-share.so %{_datadir}/nemo-share/ %{_datadir}/polkit-1/actions/org.nemo.share.samba_install.policy %files -n nemo-extension-terminal -%doc nemo-terminal/AUTHORS nemo-terminal/COPYING nemo-terminal/debian/changelog +%license nemo-terminal/COPYING +%doc nemo-terminal/AUTHORS nemo-terminal/debian/changelog %{_datadir}/nemo-terminal/ %{_datadir}/nemo-python/extensions/nemo_terminal.py %{_datadir}/glib-2.0/schemas/org.nemo.extensions.nemo-terminal.gschema.xml ++++++ nemo-dropbox_no-dropbox-bin.patch ++++++ --- /var/tmp/diff_new_pack.BcgysA/_old 2018-05-11 09:16:07.271197505 +0200 +++ /var/tmp/diff_new_pack.BcgysA/_new 2018-05-11 09:16:07.275197360 +0200 @@ -1,3 +1,18 @@ +--- nemo-dropbox.orig/data/icons/Makefile.am ++++ nemo-dropbox/data/icons/Makefile.am +@@ -1 +1 @@ +-SUBDIRS = hicolor nemo-dropbox +\ No newline at end of file ++SUBDIRS = nemo-dropbox +--- nemo-dropbox.orig/data/Makefile.am ++++ nemo-dropbox/data/Makefile.am +@@ -1,6 +1 @@ +-applicationdir = $(datadir)/applications +-application_DATA = dropbox.desktop +- +-EXTRA_DIST = $(application_DATA) +- + SUBDIRS = icons emblems --- nemo-dropbox.orig/Makefile.am +++ nemo-dropbox/Makefile.am @@ -1,16 +1,6 @@ @@ -8,7 +23,7 @@ +CLEANFILES = dropbox.txt EXTRA_DIST = dropbox.in serializeimages.py dropbox.txt.in docgen.py rst2man.py -man_MANS = dropbox.1 - +- -dropbox: dropbox.in serializeimages.py - python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox - chmod +x dropbox @@ -16,6 +31,5 @@ -dropbox.1: dropbox dropbox.txt.in docgen.py - python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt - $(RST2MAN) dropbox.txt > dropbox.1 -- --SUBDIRS = data src -+SUBDIRS = src + + SUBDIRS = data src ++++++ nemo-extensions-3.6.0.tar.gz -> nemo-extensions-3.8.0.tar.gz ++++++ ++++ 31767 lines of diff (skipped)
