From 941260323c8370b79e47d2a49f5fed19a2b124aa85f17e5e214d01cc6e9a2cc1 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 27 Dec 2016 18:34:21 +0000 Subject: [PATCH 1/3] Accepting request 447928 from security:privacy add runtime dependency to match runtime version check for libksba OBS-URL: https://build.opensuse.org/request/show/447928 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=155 --- gpg2.changes | 5 +++++ gpg2.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/gpg2.changes b/gpg2.changes index 4e43dd6..d1a8e82 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/gpg2.spec b/gpg2.spec index 34c35dc..904d2cd 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -55,6 +55,7 @@ BuildRequires: pkgconfig(zlib) Requires: libassuan0 >= 2.4.3 # Explicit runtime depencency - runtime version check Requires: libgcrypt20 >= 1.7.0 +Requires: libksba >= 1.3.4 Requires: pinentry # FIXME: use proper Requires(pre/post/preun/...) PreReq: %{install_info_prereq} From 7be46568df266e3f4f913bc88410c89a10ae60206d61e570baf174c16a6695cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Jan 2017 09:33:05 +0000 Subject: [PATCH 2/3] - Remove the fixme, condition around fdupes and enable tests OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=157 --- gpg2.changes | 5 +++++ gpg2.spec | 15 ++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gpg2.changes b/gpg2.changes index d1a8e82..677bd20 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 9 09:18:48 UTC 2017 - tchvatal@suse.com + +- Remove the fixme, condition around fdupes and enable tests + ------------------------------------------------------------------- Sun Dec 25 15:12:44 UTC 2016 - astieger@suse.com diff --git a/gpg2.spec b/gpg2.spec index 904d2cd..0c6380c 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -57,8 +57,7 @@ Requires: libassuan0 >= 2.4.3 Requires: libgcrypt20 >= 1.7.0 Requires: libksba >= 1.3.4 Requires: pinentry -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %{install_info_prereq} +Requires(post): %{install_info_prereq} Recommends: %{name}-lang = %{version} Obsoletes: dirmngr < 2.1.0 Provides: dirmngr = %{version} @@ -131,14 +130,12 @@ install -m 755 tools/gpg-zip %{buildroot}/%{_bindir} # install -m 755 tools/gpgsplit %{buildroot}/%{_bindir} %find_lang gnupg2 -%if 0%{?suse_version} > 1020 -%fdupes %{buildroot} -%endif +%fdupes -s %{buildroot} %check -# %if ! 0%{?qemu_user_space_build} -# make %{?_smp_mflags} check -# %endif +%if ! 0%{?qemu_user_space_build} +make %{?_smp_mflags} check +%endif %post %install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz From ef8e11c2a7b84c2e67794e93433714295ed260d81923ba060400a6ab7ba3182e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Jan 2017 09:54:30 +0000 Subject: [PATCH 3/3] - Remove the fixme, condition around fdupes OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=158 --- gpg2.changes | 2 +- gpg2.spec | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gpg2.changes b/gpg2.changes index 677bd20..c836816 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Jan 9 09:18:48 UTC 2017 - tchvatal@suse.com -- Remove the fixme, condition around fdupes and enable tests +- Remove the fixme, condition around fdupes ------------------------------------------------------------------- Sun Dec 25 15:12:44 UTC 2016 - astieger@suse.com diff --git a/gpg2.spec b/gpg2.spec index 0c6380c..e480277 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -133,9 +133,10 @@ install -m 755 tools/gpg-zip %{buildroot}/%{_bindir} %fdupes -s %{buildroot} %check -%if ! 0%{?qemu_user_space_build} -make %{?_smp_mflags} check -%endif +# Run only localy, fails in OBS +#%if ! 0%{?qemu_user_space_build} +#make %{?_smp_mflags} check +#%endif %post %install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz