From 9b94e1829b4f4985ffe8d2c7691c9ffef92d7606 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:40:34 +0000 Subject: import seahorse-3.14.1-1.el7 --- diff --git a/.gitignore b/.gitignore index 2aafd4a..ecad7d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/seahorse-3.8.2.tar.xz +SOURCES/seahorse-3.14.1.tar.xz diff --git a/.seahorse.metadata b/.seahorse.metadata index 9cb0047..73c56b4 100644 --- a/.seahorse.metadata +++ b/.seahorse.metadata @@ -1 +1 @@ -1f2a3d561f68f7f6279f430c9e3d674979f8bf44 SOURCES/seahorse-3.8.2.tar.xz +df86687c924eec40361adebb687d7067280a91f9 SOURCES/seahorse-3.14.1.tar.xz diff --git a/SOURCES/set-gnupg-engine.patch b/SOURCES/set-gnupg-engine.patch new file mode 100644 index 0000000..53b271a --- /dev/null +++ b/SOURCES/set-gnupg-engine.patch @@ -0,0 +1,28 @@ +From cad4d259805840d912d3f20f76bc3f4cd57e9502 Mon Sep 17 00:00:00 2001 +From: Stef Walter +Date: Sat, 25 Oct 2014 08:44:33 +0200 +Subject: [PATCH] pgp: Force use of the first gnupg found by configure.ac + +Some people are having problems using recent versions of gpg2. +This allows configure.ac to identify a version during building +and then stick to using that one. +--- + pgp/seahorse-pgp-backend.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c +index ab9b8fb..4b267c3 100644 +--- a/pgp/seahorse-pgp-backend.c ++++ b/pgp/seahorse-pgp-backend.c +@@ -310,6 +310,8 @@ seahorse_pgp_backend_initialize (void) + g_object_unref (self); + + g_return_if_fail (pgp_backend != NULL); ++ ++ gpgme_set_engine_info (GPGME_PROTOCOL_OpenPGP, GNUPG, NULL); + } + + SeahorseGpgmeKeyring * +-- +2.1.0 + diff --git a/SPECS/seahorse.spec b/SPECS/seahorse.spec index b712180..4f6dcf3 100644 --- a/SPECS/seahorse.spec +++ b/SPECS/seahorse.spec @@ -1,42 +1,37 @@ Name: seahorse -Version: 3.8.2 -Release: 3%{?dist} +Version: 3.14.1 +Release: 1%{?dist} Summary: A GNOME application for managing encryption keys Group: User Interface/Desktops # seahorse is GPLv2+ # libcryptui is LGPLv2+ License: GPLv2+ and LGPLv2+ -URL: http://projects.gnome.org/seahorse/ +URL: https://wiki.gnome.org/Apps/Seahorse #VCS: git:git://git.gnome.org/seahorse -Source: http://download.gnome.org/sources/seahorse/3.8/%{name}-%{version}.tar.xz - -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: gcr-devel +Source: https://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz + +# Use GnuPG 1.4.x instead of 2.0.x +Patch0: set-gnupg-engine.patch + +BuildRequires: pkgconfig(avahi-client) +BuildRequires: pkgconfig(avahi-glib) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gck-1) +BuildRequires: pkgconfig(gcr-3) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libsecret-unstable) +BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gpgme-devel >= 1.0 -BuildRequires: gnupg2 +BuildRequires: gnupg BuildRequires: itstool -BuildRequires: libsoup-devel +BuildRequires: libSM-devel BuildRequires: openldap-devel -BuildRequires: libnotify-devel BuildRequires: openssh-clients -BuildRequires: libsecret-devel -BuildRequires: avahi-devel -BuildRequires: avahi-glib-devel BuildRequires: intltool -BuildRequires: dbus-glib-devel -BuildRequires: gobject-introspection-devel >= 0.6.4 -BuildRequires: libSM-devel -BuildRequires: GConf2-devel -# for g-ir-scanner -BuildRequires: libtool -Requires(post): desktop-file-utils -Requires(post): /usr/bin/gtk-update-icon-cache -Requires(postun): desktop-file-utils -Requires(postun): shared-mime-info -Requires(postun): /usr/bin/gtk-update-icon-cache +BuildRequires: vala +BuildRequires: /usr/bin/appstream-util # https://bugzilla.redhat.com/show_bug.cgi?id=474419 # https://bugzilla.redhat.com/show_bug.cgi?id=587328 @@ -44,6 +39,7 @@ Requires: pinentry-gui Obsoletes: gnome-keyring-manager Obsoletes: seahorse-devel < 3.1.4-2 +Obsoletes: seahorse-plugins < 2.91.6-0.8 # Self-obsoletes to assist with seahorse-sharing package split Obsoletes: seahorse < 3.1.4 @@ -55,14 +51,10 @@ operations. It is a keyring manager. %prep %setup -q - +%patch0 -p1 %build -GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure - -# drop unneeded direct library deps with --as-needed -# libtool doesn't make this easy, so we do it the hard way -sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool +GNUPG=/usr/bin/gpg ; export GNUPG ; %configure make %{?_smp_mflags} # cleanup permissions for files that go into debuginfo @@ -88,46 +80,57 @@ rm -f ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/icon-theme.cache find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' -%pre -%gconf_schema_obsolete seahorse + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/*.appdata.xml + %post /sbin/ldconfig -update-mime-database %{_datadir}/mime/ > /dev/null update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : - +touch --no-create %{_datadir}/mime/packages &>/dev/null || : %postun /sbin/ldconfig -update-mime-database %{_datadir}/mime/ > /dev/null update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : if [ $1 -eq 0 ]; then touch --no-create %{_datadir}/icons/hicolor >&/dev/null|| : gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + update-mime-database %{_datadir}/mime &> /dev/null || : fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +update-mime-database -n %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang -%doc AUTHORS COPYING NEWS README TODO +%doc AUTHORS NEWS README TODO +%license COPYING COPYING.LIB %{_bindir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* +%{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/seahorse.png %{_datadir}/icons/hicolor/*/apps/seahorse-preferences.png -%{_mandir}/man1/*.gz +%{_mandir}/man1/*.1* %dir %{_libdir}/seahorse %{_libdir}/seahorse/* +%{_datadir}/dbus-1/services/org.gnome.seahorse.Application.service %{_datadir}/GConf/gsettings/*.convert %{_datadir}/glib-2.0/schemas/*.gschema.xml +%dir %{_datadir}/gnome-shell/ +%dir %{_datadir}/gnome-shell/search-providers/ +%{_datadir}/gnome-shell/search-providers/seahorse-search-provider.ini %changelog +* Thu May 14 2015 David King - 3.14.1-1 +- Rebase to 3.14.1 (#1193148) + * Fri Jan 24 2014 Daniel Mach - 3.8.2-3 - Mass rebuild 2014-01-24