dwmw2 pushed to coolkey (f22). "Add p11-kit module file (#1073320)"

[notifications at fedoraproject.org]

From 972c716dfd04305d8276b2a2cd95a94245d79d82 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse at intel.com>
Date: Fri, 12 Jun 2015 10:46:47 +0100
Subject: Add p11-kit module file (#1073320)


diff --git a/coolkey.module b/coolkey.module
new file mode 100644
index 0000000..521b87b
--- /dev/null
+++ b/coolkey.module
@@ -0,0 +1,8 @@
+# This file describes how to load the coolkey module
+# See: http://p11-glue.freedesktop.org/doc/p11-kit/config.html
+
+# This is a relative path, which means it will be loaded from
+# the p11-kit default path which is usually $(libdir)/pkcs11.
+# Doing it this way allows for packagers to package coolkey for
+# 32-bit and 64-bit and make them parallel installable
+module: libcoolkeypk11.so
diff --git a/coolkey.spec b/coolkey.spec
index bd6ea7b..e86ced7 100644
--- a/coolkey.spec
+++ b/coolkey.spec
@@ -22,11 +22,12 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 26%{?dist}
+Release: 27%{?dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
 Source: coolkey-%{version}.tar.gz
+Source1: coolkey.module
 Patch1: coolkey-cache-dir-move.patch
 Patch2: coolkey-gcc43.patch
 Patch3: coolkey-latest.patch
@@ -84,6 +85,8 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
 mkdir -p $RPM_BUILD_ROOT/var/cache/coolkey
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/p11-kit/modules/coolkey.module
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,6 +116,7 @@ fi
 %{_libdir}/pkcs11
 %{_libdir}/libckyapplet.so.1
 %{_libdir}/libckyapplet.so.1.0.0
+%{_datadir}/p11-kit/modules/coolkey.module
 
 %files devel
 %{_libdir}/libckyapplet.so
@@ -121,6 +125,9 @@ fi
 
 
 %changelog
+* Tue May 05 2015 David Woodhouse <dwmw2 at infradead.org> - 1.1.0-27
+- Ship p11-kit module file (#1073320)
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/coolkey.git/commit/?h=f22&id=972c716dfd04305d8276b2a2cd95a94245d79d82