Accepting request 592046 from GNOME: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. (forwarded request 591701 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/592046
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seahorse?expand=0&rev=103
This commit is contained in:
Dominique Leuenberger 2018-03-31 13:35:55 +00:00 committed by Git OBS Bridge
commit 929fbbc423
2 changed files with 23 additions and 22 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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
- Use SPDX3.0 license tags and package COPYING as %license.
-------------------------------------------------------------------
Mon Jan 15 21:28:58 UTC 2018 - mgorse@suse.com

View File

@ -20,20 +20,24 @@ 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/
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
# 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
@ -78,31 +79,18 @@ search results from seahorse.
translation-update-upstream
%build
autoreconf -fiv
%configure
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}
%post
%glib2_gsettings_schema_post
%desktop_database_post
%icon_theme_cache_post
%postun
%glib2_gsettings_schema_postun
%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 +108,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