From 836a6eb6197ed8d7ae44a930711c7874b592aec002c9f8e298d9b2e148f90664 Mon Sep 17 00:00:00 2001 From: Stef An Date: Fri, 5 Jun 2015 14:37:00 +0000 Subject: [PATCH] Accepting request 310538 from home:linuxrecon:branches:X11:Cinnamon:Factory OBS-URL: https://build.opensuse.org/request/show/310538 OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=5 --- nemo-extensions-2.4.0.tar.gz | 3 --- nemo-extensions-2.6.x.tar.gz | 3 +++ nemo-extensions.changes | 6 ++++++ nemo-extensions.spec | 28 +++++++++++++++++++++++++--- nemo-seahorse_gpg-2.1.patch | 7 +++++++ 5 files changed, 41 insertions(+), 6 deletions(-) delete mode 100644 nemo-extensions-2.4.0.tar.gz create mode 100644 nemo-extensions-2.6.x.tar.gz create mode 100644 nemo-seahorse_gpg-2.1.patch diff --git a/nemo-extensions-2.4.0.tar.gz b/nemo-extensions-2.4.0.tar.gz deleted file mode 100644 index 95c5a81..0000000 --- a/nemo-extensions-2.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f1a4621a96da605d77fd305b673e08a5f32c20e43a569573352a31f35841393 -size 3685434 diff --git a/nemo-extensions-2.6.x.tar.gz b/nemo-extensions-2.6.x.tar.gz new file mode 100644 index 0000000..98fd8e8 --- /dev/null +++ b/nemo-extensions-2.6.x.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fbfa66e77f2e92fd2f9d7522c114a1c87a262522f05c5a8d6c607c7892f8d92 +size 1135588 diff --git a/nemo-extensions.changes b/nemo-extensions.changes index e768278..234a62e 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 2 23:20:29 UTC 2015 - stefan@fam-elser.de + +- update to version 2.6.0 +- Added patch for newer gpg versions than 2.0 + ------------------------------------------------------------------- Wed Nov 5 18:32:07 UTC 2014 - i@marguerite.su diff --git a/nemo-extensions.spec b/nemo-extensions.spec index 1e7e8b8..ceb9bd0 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -17,13 +17,14 @@ Name: nemo-extensions -Version: 2.4.0 +Version: 2.6.x Release: 0 Summary: Extensions for Nemo File Manager License: GPL-2.0+ Group: Metapackages Url: https://github.com/linuxmint/nemo-extensions Source: %{name}-%{version}.tar.gz +Patch0: nemo-seahorse_gpg-2.1.patch BuildRequires: docutils BuildRequires: gnome-common BuildRequires: intltool @@ -42,6 +43,7 @@ BuildRequires: libnettle-devel BuildRequires: mhash-devel BuildRequires: mozilla-nss-devel BuildRequires: openssl-devel +BuildRequires: libgcrypt-devel %if 0%{?suse_version} >= 1320 BuildRequires: polarssl-devel %endif @@ -64,6 +66,8 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(libnotify) +# nemo-image-converter +BuildRequires: pkgconfig(gcr-3) Requires: nemo-compare = %{version} Requires: nemo-dropbox = %{version} Requires: nemo-emblems = %{version} @@ -266,6 +270,11 @@ for i in dropbox fileroller python; do popd done +# Patch for nemo-seahorse +%if 0%{?suse_version} > 1320 +%patch0 -p1 +%endif + # fix nemo-emblems spurious-executable-perm chmod 644 nemo-emblems/COPYING.GPL3 @@ -275,13 +284,15 @@ popd %build for i in dropbox fileroller preview share; do -pushd nemo-${i}; +pushd nemo-${i}; +NOCONFIGURE=1 ./autogen.sh %configure --disable-static make %{?_smp_mflags} popd done pushd nemo-gtkhash +NOCONFIGURE=1 ./autogen.sh %configure --disable-static \ --enable-linux-crypto \ --enable-gcrypt \ @@ -302,13 +313,21 @@ python setup.py build popd done -for i in image-converter python repairer seahorse; do +for i in python repairer image-converter; do pushd nemo-${i} +NOCONFIGURE=1 ./autogen.sh %configure make %{?_smp_mflags} popd done +pushd nemo-seahorse +NOCONFIGURE=1 ./autogen.sh +%configure +make %{?_smp_mflags} +popd + + %install # nemo-compare begins pushd nemo-compare @@ -556,6 +575,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/applications/seahorse-pgp-signature.desktop %{_mandir}/man1/seahorse-tool.1.gz %{_datadir}/nemo-seahorse +%{_datadir}/GConf/gsettings/org.gnome.seahorse.nautilus.convert +%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.nautilus.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.nautilus.window.gschema.xml %files -n nemo-share -f nemo-share/nemo-share.lang %defattr(-,root,root) diff --git a/nemo-seahorse_gpg-2.1.patch b/nemo-seahorse_gpg-2.1.patch new file mode 100644 index 0000000..f3c3726 --- /dev/null +++ b/nemo-seahorse_gpg-2.1.patch @@ -0,0 +1,7 @@ +--- nemo-extensions-2.6.x.orig/nemo-seahorse/configure.ac 2015-06-02 13:47:17.000000000 +0200 ++++ nemo-extensions-2.6.x/nemo-seahorse/configure.ac 2015-06-04 12:36:57.193509827 +0200 +@@ -59,3 +59,3 @@ + if test "$DO_CHECK" = "yes"; then +- accepted_versions="1.2 1.4 2.0" ++ accepted_versions="1.2 1.4 2.0 2.1" + AC_PATH_PROGS(GNUPG, [gpg gpg2], no)