From 545042d446155db0da549ca71c68f6109903137858eda0b5deacad9997fb62dc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 1 Mar 2018 11:11:52 +0000 Subject: [PATCH 1/2] Accepting request 580203 from GNOME:Next spdx3 OBS-URL: https://build.opensuse.org/request/show/580203 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=184 --- seahorse.changes | 5 +++++ seahorse.spec | 18 +++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/seahorse.changes b/seahorse.changes index 03e1122..ec989f5 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 26 11:34:40 UTC 2018 - dimstar@opensuse.org + +- Use SPDX3.0 license tags and package COPYING as %license. + ------------------------------------------------------------------- Mon Jan 15 21:28:58 UTC 2018 - mgorse@suse.com diff --git a/seahorse.spec b/seahorse.spec index 536a61e..fdec29b 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -20,7 +20,7 @@ Name: seahorse Version: 3.20.0 Release: 0 Summary: GNOME interface for gnupg -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Security Url: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.20/%{name}-%{version}.tar.xz @@ -28,12 +28,16 @@ Source: http://download.gnome.org/sources/seahorse/3.20/%{name}-%{versio Patch0: seahorse-gpg-ignore-key-considered.patch # PATCH-FIX-UPSTREAM seahorse-new-gnupg.patch bsc#1075928 mgorse@suse.com -- mark gnupg 2.2.x as supported. Patch1: seahorse-new-gnupg.patch +# needed for patch1/patch2 +BuildRequires: autoconf +BuildRequires: automake BuildRequires: fdupes BuildRequires: gpg2 BuildRequires: gpgme-devel BuildRequires: intltool BuildRequires: openldap2-devel BuildRequires: openssh +BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: vala >= 0.18.0 @@ -46,14 +50,10 @@ BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libsecret-unstable) >= 0.16 BuildRequires: pkgconfig(libsoup-2.4) >= 2.33.92 -# needed for patch1/patch2 -BuildRequires: autoconf -BuildRequires: automake Recommends: %{name}-lang Obsoletes: %{name}-devel < %{version} # We dropped seahorse-plugins in 12.1 Obsoletes: seahorse-plugins <= 2.30.1.git.20110502 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires %description @@ -71,6 +71,7 @@ This package contains a search provider to enable GNOME Shell to get search results from seahorse. %lang_package + %prep %setup -q %patch0 -p1 @@ -83,7 +84,7 @@ make %{?_smp_mflags} V=1 %install %make_install -find %{buildroot} -type f -name '*.la' -delete -print +find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file %{name} %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} @@ -98,11 +99,7 @@ find %{buildroot} -type f -name '*.la' -delete -print %desktop_database_postun %icon_theme_cache_postun -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root) %doc AUTHORS ChangeLog ChangeLog.pre-auto NEWS README %doc %{_datadir}/help/C/%{name}/ %{_bindir}/seahorse @@ -120,7 +117,6 @@ rm -rf %{buildroot} %{_mandir}/man1/seahorse.1%{?ext_man} %files -n gnome-shell-search-provider-seahorse -%defattr(-,root,root) %{_datadir}/dbus-1/services/org.gnome.seahorse.Application.service %dir %{_datadir}/gnome-shell %dir %{_datadir}/gnome-shell/search-providers From f9dba4d81a0fc69ec113df83cd9904c4b3a8be216167af1143f1ca0ae6cd1f26 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 28 Mar 2018 13:07:35 +0000 Subject: [PATCH 2/2] Accepting request 591701 from home:dimstar:Factory - Add explicit call to autoreconf: some of the patches touch the build system. - Drop -lib2_gsettings_schema_post[un], desktop_database_post[un] and icon_theme_cache_post[un] usage from post/postun scripts: the functionality covered by file triggers. OBS-URL: https://build.opensuse.org/request/show/591701 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=185 --- seahorse.changes | 9 +++++++++ seahorse.spec | 13 ++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/seahorse.changes b/seahorse.changes index ec989f5..2029a10 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 27 15:40:00 UTC 2018 - dimstar@opensuse.org + +- Add explicit call to autoreconf: some of the patches touch the + build system. +- Drop -lib2_gsettings_schema_post[un], desktop_database_post[un] + and icon_theme_cache_post[un] usage from post/postun scripts: the + functionality covered by file triggers. + ------------------------------------------------------------------- Mon Feb 26 11:34:40 UTC 2018 - dimstar@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index fdec29b..0fb605d 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -22,7 +22,7 @@ Release: 0 Summary: GNOME interface for gnupg License: GPL-2.0-or-later Group: Productivity/Security -Url: http://projects.gnome.org/seahorse/ +URL: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.20/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM seahorse-gpg-ignore-key-considered.patch bgo#778607 mgorse@suse.com -- ignore key_considered line introduced in gpg 2.1.13. Patch0: seahorse-gpg-ignore-key-considered.patch @@ -79,6 +79,7 @@ search results from seahorse. translation-update-upstream %build +autoreconf -fiv %configure make %{?_smp_mflags} V=1 @@ -89,16 +90,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} -%post -%glib2_gsettings_schema_post -%desktop_database_post -%icon_theme_cache_post - -%postun -%glib2_gsettings_schema_postun -%desktop_database_postun -%icon_theme_cache_postun - %files %doc AUTHORS ChangeLog ChangeLog.pre-auto NEWS README %doc %{_datadir}/help/C/%{name}/