[opensc] Add a configuration file for p11-kit (#840504)

Tomáš Mráz tmraz at fedoraproject.org
Fri Jul 27 11:58:19 UTC 2012


commit b0d9da9bce1d3bb149fabfd80686b3e3e39f9e71
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Fri Jul 27 13:57:22 2012 +0200

    Add a configuration file for p11-kit (#840504)

 opensc-module |    8 ++++++++
 opensc.spec   |    8 +++++++-
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/opensc-module b/opensc-module
new file mode 100644
index 0000000..3246ab4
--- /dev/null
+++ b/opensc-module
@@ -0,0 +1,8 @@
+# This file describes how to load the opensc 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 opensc for
+# 32-bit and 64-bit and make them parallel installable
+module: onepin-opensc-pkcs11.so
diff --git a/opensc.spec b/opensc.spec
index e2a6c81..1fc8d1d 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,12 +1,13 @@
 Name:           opensc
 Version:        0.12.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensc-project.org/opensc/
 Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
+Source1:        opensc-module
 Patch0:         opensc-fixdso.patch
 
 BuildRequires:  pcsc-lite-devel
@@ -50,6 +51,7 @@ make %{?_smp_mflags} V=1
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/opensc-module
 # use NEWS file timestamp as reference for configuration file
 touch -r NEWS $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
 
@@ -72,6 +74,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libopensc.so
 %defattr(-,root,root,-)
 %doc COPYING NEWS README*
 %config(noreplace) %{_sysconfdir}/opensc.conf
+%config(noreplace) %{_sysconfdir}/pkcs11/opensc-module
 %{_bindir}/cardos-tool
 %{_bindir}/cryptoflex-tool
 %{_bindir}/eidenv
@@ -109,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libopensc.so
 
 
 %changelog
+* Fri Jul 27 2012 Tomas Mraz <tmraz at redhat.com> - 0.12.2-6
+- Add a configuration file for p11-kit (#840504)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list