1
0
Alexei Sorokin 2015-12-12 14:33:59 +00:00 committed by Git OBS Bridge
parent 66ef0461e8
commit 35a838b360
3 changed files with 39 additions and 33 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Dec 12 13:01:59 UTC 2015 - sor.alexei@meowr.ru
- Add nemo-seahorse_no-nautilus-conflicts.patch: do not install
files that conflict with nautilus-extension-seahorse.
- Depend on nautilus-extension-seahorse.
-------------------------------------------------------------------
Wed Oct 21 14:05:01 UTC 2015 - sor.alexei@meowr.ru

View File

@ -29,8 +29,10 @@ Source: https://github.com/linuxmint/%{name}/archive/%{_version}.tar.gz#
Patch0: nemo-seahorse_gpg-2.1.patch
# PATCH-FIX-UPSTREAM nemo-terminal_vte-2.91.patch
Patch1: nemo-terminal_vte-2.91.patch
# PATCH-FIX-OPENSUSE nemo-seahorse_no-nautilus-conflicts.patch sor.alexei@meowr.ru -- Strip conflicted with nautilus-extension-seahorse files.
Patch2: nemo-seahorse_no-nautilus-conflicts.patch
# PATCH-FIX-OPENSUSE nemo-dropbox_no-dropbox-bin.patch sor.alexei@meowr.ru -- Strip dropbox binary installation.
Patch2: nemo-dropbox_no-dropbox-bin.patch
Patch3: nemo-dropbox_no-dropbox-bin.patch
BuildRequires: docutils
BuildRequires: gettext-runtime
BuildRequires: gnome-common
@ -79,7 +81,7 @@ License: GPL-2.0
Group: System/GUI/Other
Requires: nemo >= %{_version}
Provides: python-nemo-devel = %{version}
# nemo-python is last seen in openSUSE 13.2.
# nemo-python was last used in openSUSE 13.2.
Provides: nemo-python = %{version}
Obsoletes: nemo-python < %{version}
@ -108,7 +110,7 @@ Requires: python-gobject
Requires: python-gtk
Requires: python-nemo = %{version}
Requires: python-xdg
# nemo-compare is last seen in openSUSE 13.2.
# nemo-compare was last used in openSUSE 13.2.
Provides: nemo-compare = %{version}
Obsoletes: nemo-compare < %{version}
BuildArch: noarch
@ -128,7 +130,7 @@ Group: System/GUI/Other
Requires: dropbox
Requires: nemo >= %{_version}
Supplements: packageand(dropbox:nemo)
# nemo-dropbox is last seen in openSUSE 13.2.
# nemo-dropbox was last used in openSUSE 13.2.
Provides: nemo-dropbox = %{version}
Obsoletes: nemo-dropbox < %{version}
@ -141,7 +143,7 @@ License: GPL-3.0
Group: System/GUI/Other
Requires: nemo >= %{_version}
Requires: python-gobject
# nemo-emblems is last seen in openSUSE 13.2.
# nemo-emblems was last used in openSUSE 13.2.
Provides: nemo-emblems = %{version}
Obsoletes: nemo-emblems < %{version}
BuildArch: noarch
@ -157,7 +159,7 @@ Group: System/GUI/Other
Requires: file-roller
Requires: nemo >= %{_version}
Supplements: packageand(nemo:file-roller)
# nemo-fileroller is last seen in openSUSE 13.2.
# nemo-fileroller was last used in openSUSE 13.2.
Provides: nemo-fileroller = %{version}
Obsoletes: nemo-fileroller < %{version}
@ -169,7 +171,7 @@ Summary: Nemo extension for computing checksums and more using gtkhash
License: GPL-2.0+
Group: System/GUI/Other
Requires: nemo >= %{_version}
# nemo-gtkhash is last seen in openSUSE 13.2.
# nemo-gtkhash was last used in openSUSE 13.2.
Obsoletes: nemo-gtkhash < %{version}
Provides: nemo-gtkhash = %{version}
%glib2_gsettings_schema_requires
@ -186,7 +188,7 @@ License: GPL-2.0+
Group: System/GUI/Other
Requires: ImageMagick
Requires: nemo >= %{_version}
# nemo-image-converter is last seen in openSUSE 13.2.
# nemo-image-converter was last used in openSUSE 13.2.
Provides: nemo-image-converter = %{version}
Obsoletes: nemo-image-converter < %{version}
@ -208,7 +210,7 @@ Requires: python-mutagen
Requires: python-nemo = %{version}
Requires: python-pyexiv2
Requires: python-pypdf
# nemo-media-columns is last seen in openSUSE 13.2.
# nemo-media-columns was last used in openSUSE 13.2.
Provides: nemo-media-columns = %{version}
Obsoletes: nemo-media-columns < %{version}
BuildArch: noarch
@ -225,7 +227,7 @@ Group: System/GUI/Other
Requires: nemo >= %{_version}
Requires: python-gobject
Requires: python-xdg
# nemo-pastebin is last seen in openSUSE 13.2.
# nemo-pastebin was last used in openSUSE 13.2.
Provides: nemo-pastebin = %{version}
Obsoletes: nemo-pastebin < %{version}
BuildArch: noarch
@ -241,7 +243,7 @@ License: GPL-2.0+
Group: System/GUI/Other
Requires: gstreamer-plugins-good
Requires: nemo >= %{_version}
# nemo-preview is last seen in openSUSE 13.2.
# nemo-preview was last used in openSUSE 13.2.
Obsoletes: nemo-preview < %{version}
Provides: nemo-preview = %{version}
Provides: nemo-extension-preview-devel = %{version}
@ -258,7 +260,7 @@ Requires: dbus-1-python
Requires: nemo >= %{_version}
Requires: python-nemo = %{version}
Supplements: packageand(nemo:rabbitvcs)
# nemo-rabbitvcs is last seen in openSUSE 13.2.
# nemo-rabbitvcs was last used in openSUSE 13.2.
Obsoletes: nemo-rabbitvcs < %{version}
Provides: nemo-rabbitvcs = %{version}
BuildArch: noarch
@ -271,7 +273,7 @@ Summary: Nemo extension for filename encoding repair
License: GPL-2.0+
Group: System/GUI/Other
Requires: nemo >= %{_version}
# nemo-repairer is last seen in openSUSE 13.2.
# nemo-repairer was last used in openSUSE 13.2.
Provides: nemo-repairer = %{version}
Obsoletes: nemo-repairer < %{version}
@ -288,10 +290,10 @@ This extension also provides a decoded name for URL encoded filename.
Summary: OpenPGP encryption/decryption extension for Nemo file manager
License: GPL-2.0+
Group: System/GUI/Other
Requires: nautilus-extension-seahorse >= 3.0
Requires: nemo >= %{_version}
Requires: seahorse
Supplements: packageand(nemo:seahorse)
# nemo-seahorse is last seen in openSUSE 13.2.
# nemo-seahorse was last used in openSUSE 13.2.
Provides: nemo-seahorse = %{version}
Obsoletes: nemo-seahorse < %{version}
@ -306,7 +308,7 @@ Group: System/GUI/Other
Requires: nemo >= %{_version}
Recommends: samba
Supplements: packageand(nemo:samba)
# nemo-share is last seen in openSUSE 13.2.
# nemo-share was last used in openSUSE 13.2.
Provides: nemo-share = %{version}
Obsoletes: nemo-share < %{version}
@ -321,7 +323,7 @@ Group: System/GUI/Other
Requires: nemo >= %{_version}
Requires: python-gobject
Requires: python-nemo = %{version}
# nemo-terminal is last seen in openSUSE 13.2.
# nemo-terminal was last used in openSUSE 13.2.
Provides: nemo-terminal = %{version}
Obsoletes: nemo-terminal < %{version}
BuildArch: noarch
@ -337,6 +339,7 @@ directory in Nemo.
%patch0
%patch1
%patch2
%patch3
# Remove spurious executable permission.
chmod a-x nemo-audio-tab/COPYING.GPL3 nemo-emblems/COPYING.GPL3
@ -434,12 +437,6 @@ mv -f %{buildroot}%{_datadir}/doc/nemo-python/ %{buildroot}%{_docdir}/nemo-pytho
install -Dm 0644 nemo-rabbitvcs/RabbitVCS.py \
%{buildroot}%{_datadir}/nemo-python/extensions/RabbitVCS.py
# For nemo-extension-seahorse.
%find_lang nemo-seahorse
%suse_update_desktop_file seahorse-pgp-encrypted
%suse_update_desktop_file seahorse-pgp-keys
%suse_update_desktop_file seahorse-pgp-signature
# For nemo-extension-terminal.
pushd nemo-terminal
mkdir -p %{buildroot}%{_datadir}/nemo-terminal/
@ -449,7 +446,7 @@ cp -a src/*.xml %{buildroot}%{_datadir}/glib-2.0/schemas/
cp -a pixmap/*.png %{buildroot}%{_datadir}/nemo-terminal/
popd
for ext in emblems gtkhash filename-repairer image-converter pastebin preview share; do
for ext in emblems gtkhash filename-repairer image-converter pastebin preview share seahorse; do
%find_lang nemo-$ext
done
@ -606,16 +603,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n nemo-extension-seahorse -f nemo-seahorse.lang
%defattr(-,root,root)
%doc nemo-seahorse/COPYING nemo-seahorse/debian/changelog
%{_bindir}/seahorse-tool
%{_libdir}/nemo/extensions-3.0/libnemo-seahorse.so
%{_datadir}/nemo-seahorse/
%{_datadir}/applications/seahorse-pgp-encrypted.desktop
%{_datadir}/applications/seahorse-pgp-keys.desktop
%{_datadir}/applications/seahorse-pgp-signature.desktop
%{_mandir}/man1/seahorse-tool.1%{?ext_man}
%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.nautilus.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.nautilus.window.gschema.xml
%{_datadir}/GConf/gsettings/org.gnome.seahorse.nautilus.convert
%files -n nemo-extension-share -f nemo-share.lang
%defattr(-,root,root)

View File

@ -0,0 +1,11 @@
--- nemo-seahorse.orig/Makefile.am
+++ nemo-seahorse/Makefile.am
@@ -1,8 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
- data \
- tool \
nemo-ext \
po