From 97910ac5da9c1da6a5ceb8b0b8881722297bf9caaa67cf366915967d8fed36d8 Mon Sep 17 00:00:00 2001
From: Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
Date: Tue, 26 Sep 2023 10:55:09 +0000
Subject: [PATCH] Accepting request 1113650 from
 home:pmonrealgonzalez:branches:Base:System

* Rework excludes in the spec's files section.

OBS-URL: https://build.opensuse.org/request/show/1113650
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=290
---
 gpg2.changes |  1 +
 gpg2.spec    | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gpg2.changes b/gpg2.changes
index ae5ee0c..6beaa88 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -3,6 +3,7 @@ Thu Sep 21 07:36:32 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
 
 - Install the systemd user units in the _userunitdir [bsc#1201564]
   * Note that, there is no activation by default.
+  * Rework excludes in the spec's files section.
 
 -------------------------------------------------------------------
 Fri Mar 10 09:03:00 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
diff --git a/gpg2.spec b/gpg2.spec
index c5a1441..e570ffb 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -186,13 +186,11 @@ mv %{buildroot}%{_docdir}/%{name}/examples/systemd-user/*.s* %{buildroot}%{_user
 %license COPYING*
 %doc AUTHORS ChangeLog NEWS THANKS TODO doc/FAQ README
 %{_infodir}/gnupg*
-%exclude %{_mandir}/*/dirmngr*%{ext_man}
-%{_mandir}/*/*%{ext_man}
+%{_mandir}/*/[agsw]*%{ext_man}
 %doc %{_docdir}/%{name}
-%exclude %{_bindir}/dirmngr*
-%exclude %{_bindir}/tpm2daemon*
-%{_bindir}/*
-%{_libdir}/[^d]*
+%{_bindir}/[gksw]*
+%{_libdir}/g*
+%{_libdir}/k*
 %{_sbindir}/addgnupghome
 %{_sbindir}/applygnupgdefaults
 %{_sbindir}/g13-syshelp
@@ -201,8 +199,6 @@ mv %{buildroot}%{_docdir}/%{name}/examples/systemd-user/*.s* %{buildroot}%{_user
 %dir %{_sysconfdir}/gnupg
 %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 %{_userunitdir}/gpg-agent*
-# This exclude is needed for i586 and armv7l
-%exclude %{_userunitdir}/dirmngr.*
 
 %files -n dirmngr
 %license COPYING*
@@ -211,6 +207,7 @@ mv %{buildroot}%{_docdir}/%{name}/examples/systemd-user/*.s* %{buildroot}%{_user
 %{_userunitdir}/dirmngr.*
 
 %files tpm
+%license COPYING*
 %{_bindir}/tpm2daemon*
 
 %changelog