From adb7cbe63f6235218574bf83a8b7e03511c3505e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Fri, 24 Feb 2017 10:12:16 +0100
Subject: [PATCH] Subpackage command line tools

---
 p11-kit-systemd-path.patch | 22 +++++++++++++++++++++
 p11-kit.spec               | 39 +++++++++++++++++++++++++++-----------
 2 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 p11-kit-systemd-path.patch

diff --git a/p11-kit-systemd-path.patch b/p11-kit-systemd-path.patch
new file mode 100644
index 0000000..14440f6
--- /dev/null
+++ b/p11-kit-systemd-path.patch
@@ -0,0 +1,22 @@
+From 20a6109a27a7d97dde42140a75129e4f228ba895 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <dueno@redhat.com>
+Date: Fri, 24 Feb 2017 09:57:34 +0100
+Subject: [PATCH] systemd: Fix the location of p11-kit-remote
+
+---
+ p11-kit/p11-kit-remote@.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/p11-kit/p11-kit-remote@.service.in b/p11-kit/p11-kit-remote@.service.in
+index dd6d332..d42b180 100644
+--- a/p11-kit/p11-kit-remote@.service.in
++++ b/p11-kit/p11-kit-remote@.service.in
+@@ -7,4 +7,4 @@ Requires=p11-kit-remote.socket
+ StandardInput=socket
+ StandardOutput=socket
+ StandardError=journal
+-ExecStart=@libdir@/p11-kit/p11-kit-remote @libdir@/p11-kit-proxy.so
++ExecStart=@libexecdir@/p11-kit/p11-kit-remote @libdir@/p11-kit-proxy.so
+-- 
+2.9.3
+
diff --git a/p11-kit.spec b/p11-kit.spec
index 376e066..f9f6a7a 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,12 +1,13 @@
 Name:           p11-kit
 Version:        0.23.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for loading and sharing PKCS#11 modules
 
 License:        BSD
 URL:            http://p11-glue.freedesktop.org/p11-kit.html
 Source0:        https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz
 Source1:        trust-extract-compat
+Patch0:		p11-kit-systemd-path.patch
 
 BuildRequires:  libtasn1-devel >= 2.3
 BuildRequires:  libffi-devel
@@ -40,6 +41,15 @@ The %{name}-trust package contains a system trust PKCS#11 module which
 contains certificate anchors and black lists.
 
 
+%package tools
+Summary:        Command line tools for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description tools
+The %{name}-tools package contains command line tools that enable to export
+PKCS#11 modules through a Unix domain socket.
+
+
 # solution taken from icedtea-web.spec
 %define multilib_arches ppc64 sparc64 x86_64 ppc64le
 %ifarch %{multilib_arches}
@@ -51,6 +61,7 @@ contains certificate anchors and black lists.
 
 %prep
 %setup -q
+%patch0 -p1 -b .systemd-path
 
 %build
 # These paths are the source paths that  come from the plan here:
@@ -95,18 +106,8 @@ fi
 %dir %{_sysconfdir}/pkcs11/modules
 %dir %{_datadir}/p11-kit
 %dir %{_datadir}/p11-kit/modules
-%dir %{_libexecdir}/p11-kit
-%{_bindir}/p11-kit
 %{_libdir}/libp11-kit.so.*
 %{_libdir}/p11-kit-proxy.so
-%{_libdir}/pkcs11/p11-kit-client.so
-%{_libexecdir}/p11-kit/p11-kit-remote
-%{_libexecdir}/p11-kit/p11-kit-server
-%{_userunitdir}/p11-kit-remote@.service
-%{_userunitdir}/p11-kit-remote.socket
-%{_userunitdir}/sockets.target.wants/p11-kit-remote.socket
-%{_mandir}/man1/trust.1.gz
-%{_mandir}/man8/p11-kit.8.gz
 %{_mandir}/man5/pkcs11.conf.5.gz
 
 %files devel
@@ -121,9 +122,25 @@ fi
 %{_libdir}/pkcs11/p11-kit-trust.so
 %{_datadir}/p11-kit/modules/p11-kit-trust.module
 %{_libexecdir}/p11-kit/trust-extract-compat
+%{_mandir}/man1/trust.1.gz
+
+%files tools
+%dir %{_libexecdir}/p11-kit
+%{_bindir}/p11-kit
+%{_libdir}/pkcs11/p11-kit-client.so
+%{_libexecdir}/p11-kit/p11-kit-remote
+%{_libexecdir}/p11-kit/p11-kit-server
+%{_userunitdir}/p11-kit-remote@.service
+%{_userunitdir}/p11-kit-remote.socket
+%{_userunitdir}/sockets.target.wants/p11-kit-remote.socket
+%{_mandir}/man8/p11-kit.8.gz
 
 
 %changelog
+* Fri Feb 24 2017 Daiki Ueno <dueno@redhat.com> - 0.23.4-2
+- Split out command line tools to -tools subpackage, to avoid a
+  multilib issue with the main package.  Suggested by Yanko Kaneti.
+
 * Wed Feb 22 2017 Daiki Ueno <dueno@redhat.com> - 0.23.4-1
 - Update to 0.23.4 release