Accepting request 449308 from Base:System

- Remove the fixme, condition around fdupes

- add runtime dependency to match runtime version check for libksba

OBS-URL: https://build.opensuse.org/request/show/449308
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=111
This commit is contained in:
Dominique Leuenberger 2017-01-10 09:36:57 +00:00 committed by Git OBS Bridge
parent d57bf5c845
commit 91f2b8f045
2 changed files with 18 additions and 9 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jan 9 09:18:48 UTC 2017 - tchvatal@suse.com
- Remove the fixme, condition around fdupes
-------------------------------------------------------------------
Sun Dec 25 15:12:44 UTC 2016 - astieger@suse.com
- add runtime dependency to match runtime version check for libksba
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 20 18:58:55 UTC 2016 - astieger@suse.com Tue Dec 20 18:58:55 UTC 2016 - astieger@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package gpg2 # spec file for package gpg2
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -55,9 +55,9 @@ BuildRequires: pkgconfig(zlib)
Requires: libassuan0 >= 2.4.3 Requires: libassuan0 >= 2.4.3
# Explicit runtime depencency - runtime version check # Explicit runtime depencency - runtime version check
Requires: libgcrypt20 >= 1.7.0 Requires: libgcrypt20 >= 1.7.0
Requires: libksba >= 1.3.4
Requires: pinentry Requires: pinentry
# FIXME: use proper Requires(pre/post/preun/...) Requires(post): %{install_info_prereq}
PreReq: %{install_info_prereq}
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Obsoletes: dirmngr < 2.1.0 Obsoletes: dirmngr < 2.1.0
Provides: dirmngr = %{version} Provides: dirmngr = %{version}
@ -130,14 +130,13 @@ install -m 755 tools/gpg-zip %{buildroot}/%{_bindir}
# install -m 755 tools/gpgsplit %{buildroot}/%{_bindir} # install -m 755 tools/gpgsplit %{buildroot}/%{_bindir}
%find_lang gnupg2 %find_lang gnupg2
%if 0%{?suse_version} > 1020 %fdupes -s %{buildroot}
%fdupes %{buildroot}
%endif
%check %check
# %if ! 0%{?qemu_user_space_build} # Run only localy, fails in OBS
# make %{?_smp_mflags} check #%if ! 0%{?qemu_user_space_build}
# %endif #make %{?_smp_mflags} check
#%endif
%post %post
%install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz