1
0

Accepting request 838456 from X11:Cinnamon:Factory

OBS-URL: https://build.opensuse.org/request/show/838456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nemo-extensions?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2020-09-29 17:03:37 +00:00 committed by Git OBS Bridge
commit b3961e91e6
6 changed files with 137 additions and 41 deletions

View File

@ -1,35 +1,7 @@
--- a/nemo-dropbox/data/icons/Makefile.am 2019-02-08 16:11:14.000000000 +0600
+++ b/nemo-dropbox/data/icons/Makefile.am 2019-04-26 16:24:53.987859398 +0600
diff -ruN a/nemo-dropbox/data/icons/Makefile.am c/nemo-dropbox/data/icons/Makefile.am
--- a/nemo-dropbox/data/icons/Makefile.am 2020-05-13 20:20:10.000000000 +0700
+++ c/nemo-dropbox/data/icons/Makefile.am 2020-09-26 23:36:50.507877568 +0700
@@ -1 +1 @@
-SUBDIRS = hicolor nemo-dropbox
\ В конце файла нет новой строки
\ No newline at end of file
+SUBDIRS = nemo-dropbox
--- a/nemo-dropbox/data/Makefile.am 2019-02-08 16:11:14.000000000 +0600
+++ b/nemo-dropbox/data/Makefile.am 2019-04-26 16:22:54.579516828 +0600
@@ -1,6 +1 @@
-applicationdir = $(datadir)/applications
-application_DATA = dropbox.desktop
-
-EXTRA_DIST = $(application_DATA)
-
SUBDIRS = icons emblems
--- a/nemo-dropbox/Makefile.am 2019-02-08 16:11:14.000000000 +0600
+++ b/nemo-dropbox/Makefile.am 2019-04-26 16:20:16.871064377 +0600
@@ -1,16 +1,6 @@
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
-bin_SCRIPTS = dropbox
-CLEANFILES = $(bin_SCRIPTS) dropbox.1 dropbox.txt
+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
-
-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

View File

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

View File

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

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Wed Sep 23 20:27:18 UTC 2020 - andy great <andythe_great@pm.me>
- Update to version 4.6.0.
* Remove autogenerated files from tree
* nemo-python: be compatible with python 3.8
* nemo-dropbox: PEP 394 support
* nemo-preview: Don't override the window's gravity, and remove
an icon lookup flag that was throwing warnings (it's
incompatible with the function it's used in).
* nemo-dropbox: Get rid of stuff that we haven't been using,
because the dropbox package provides it all now.
* nemo-seahorse: Remove build-dependency on libgnome-keyring
* Add a build-order file needed by mint-build to install
nemo-python before testing the other subprojects.
* Fix nemo-python fails to compile with gcc-10 (#351)
* Use mint-common for installing samba, and hide the install
button.
* nemo-pastebin: Fix shebang
* l10n: Update makepot
- Build extensions.
* nemo-dropbox
* nemo-repairer
* nemo-share
* nemo-seahorse
* nemo-audio-tab
* nemo-gtkhash - Did not build it, no clue why it make nemo
segfault. gh#linuxmint/nemo-extensions#378
- Rebase nemo-dropbox_no-dropbox-bin.patch
- Rebase nemo-seahorse_no-nautilus-conflicts.patch.
-------------------------------------------------------------------
Tue Jun 2 11:14:09 UTC 2020 - Matej Cepl <mcepl@suse.com>

View File

@ -16,12 +16,13 @@
#
# Disable build for nemo-extension-gtkhash for now, no clue why it cause nemo to segfault.
# 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 4.0.0
Name: nemo-extensions
Version: 4.4.0
Version: 4.6.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
@ -61,7 +62,6 @@ BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(evince-view-3.0)
BuildRequires: pkgconfig(gcr-3)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gtk-doc)
@ -371,6 +371,7 @@ directory in Nemo.
%prep
%autosetup -p1
find -name COPYING.GPL3 -exec chmod -x '{}' \;
%build
@ -416,6 +417,50 @@ pushd nemo-compare
%py3_build
popd
pushd nemo-dropbox
NOCONFIGURE=1 ./autogen.sh
%configure
%make_build
popd
pushd nemo-repairer
NOCONFIGURE=1 ./autogen.sh
%configure
%make_build
popd
pushd nemo-seahorse
NOCONFIGURE=1 ./autogen.sh
%configure
%make_build
popd
pushd nemo-share
NOCONFIGURE=1 ./autogen.sh
%configure
%make_build
popd
# pushd nemo-gtkhash
# NOCONFIGURE=1 ./autogen.sh
# %%configure \
# --with-gtk=3.0 \
# --enable-linux-crypto \
# --enable-gcrypt \
# --enable-libcrypto \
# --enable-mbedtls \
# --enable-nettle \
# --enable-nss \
# --enable-mhash \
# --enable-nemo
#
# %%make_build
# popd
pushd nemo-audio-tab
%py3_build
popd
%install
pushd nemo-pastebin
%py3_install
@ -449,7 +494,32 @@ pushd nemo-compare
%py3_install
popd
pushd nemo-dropbox
%make_install
popd
pushd nemo-repairer
%make_install
popd
pushd nemo-seahorse
%make_install
popd
pushd nemo-share
%make_install
popd
# pushd nemo-gtkhash
# %%make_install
# popd
pushd nemo-audio-tab
%py3_install
popd
%find_lang nemo-preview
%find_lang nemo-share
find %{buildroot} -type f -name "*.la" -delete -print
%fdupes %{buildroot}/%{_prefix}
@ -514,6 +584,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n nemo-extension-audio-tab
%license nemo-audio-tab/COPYING*
%doc nemo-audio-tab/debian/changelog
%{_datadir}/nemo-python/extensions/nemo-audio-tab.py*
%dir %{_datadir}/nemo-audio-tab
%{_datadir}/nemo-audio-tab/nemo-audio-tab.glade
%{python3_sitelib}/nemo_audio_tab-%{version}-py?.?.egg-info
%files -n nemo-extension-compare
%license nemo-compare/nemo-compare/COPYING*
@ -526,6 +600,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n nemo-extension-dropbox
%license nemo-dropbox/COPYING
%doc nemo-dropbox/AUTHORS nemo-dropbox/debian/changelog
%exclude %{_libdir}/nemo/extensions-3.0/libnemo-dropbox.a
%{_libdir}/nemo/extensions-3.0/libnemo-dropbox.so
%{_datadir}/nemo-dropbox/
%files -n nemo-extension-emblems
%license nemo-emblems/COPYING*
@ -542,6 +619,14 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n nemo-extension-gtkhash
%license nemo-gtkhash/COPYING
%doc nemo-gtkhash/AUTHORS nemo-gtkhash/debian/changelog
# %%{_bindir}/gtkhash
# %%{_datadir}/glib-2.0/schemas/app.gtkhash.gschema.xml
# %%dir %%{_datadir}/nemo-gtkhash
# %%{_datadir}/nemo-gtkhash/gtkhash.xml.gz
# %%{_libdir}/nemo/extensions-3.0/libgtkhash-properties.so
# %%{_datadir}/glib-2.0/schemas/org.nemo.extensions.gtkhash.gschema.xml
# %%dir %%{_datadir}/nemo-gtkhash/nautilus
# %%{_datadir}/nemo-gtkhash/nautilus/gtkhash-properties.xml.gz
%files -n nemo-extension-image-converter
%license nemo-image-converter/COPYING
@ -572,14 +657,22 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n nemo-extension-repairer
%license nemo-repairer/COPYING
%doc nemo-repairer/AUTHORS nemo-repairer/README
%{_libdir}/nemo/extensions-3.0/libnemo-filename-repairer.so
%{_bindir}/nemo-filename-repairer
%{_datadir}/nemo-filename-repairer/
%files -n nemo-extension-seahorse
%license nemo-seahorse/COPYING
%doc nemo-seahorse/debian/changelog
%{_libdir}/nemo/extensions-3.0/libnemo-seahorse.so
%files -n nemo-extension-share
%files -n nemo-extension-share -f nemo-share.lang
%license nemo-share/COPYING
%doc nemo-share/AUTHORS nemo-share/debian/changelog
%{_libdir}/nemo/extensions-3.0/libnemo-share.so
%exclude %{_libdir}/nemo/extensions-3.0/libnemo-share.a
%{_datadir}/nemo-share/
%{_datadir}/polkit-1/actions/org.nemo.share.samba_install.policy
%files -n nemo-extension-terminal
%license nemo-terminal/COPYING
@ -589,6 +682,5 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_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-%{version}-py?.?.egg-info/*
%changelog

View File

@ -1,5 +1,6 @@
--- a/nemo-seahorse/Makefile.am 2019-02-08 16:11:14.000000000 +0600
+++ b/nemo-seahorse/Makefile.am 2019-04-26 16:01:50.487857001 +0600
diff -ruN a/nemo-seahorse/Makefile.am b/nemo-seahorse/Makefile.am
--- a/nemo-seahorse/Makefile.am 2020-05-13 20:20:10.000000000 +0700
+++ b/nemo-seahorse/Makefile.am 2020-09-26 23:11:34.044931301 +0700
@@ -1,8 +1,6 @@
ACLOCAL_AMFLAGS = -I m4