From fe2d7f3b20494ac6ee1788fb97c3dec28648d946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Tue, 23 Jul 2013 08:21:32 +0200
Subject: [PATCH] - update pkcsconf man page (#948460)

---
 opencryptoki-3.0-pkcsconf-man.patch | 35 +++++++++++++++++++++++++++++
 opencryptoki.spec                   |  9 +++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 opencryptoki-3.0-pkcsconf-man.patch

diff --git a/opencryptoki-3.0-pkcsconf-man.patch b/opencryptoki-3.0-pkcsconf-man.patch
new file mode 100644
index 0000000..cf547ab
--- /dev/null
+++ b/opencryptoki-3.0-pkcsconf-man.patch
@@ -0,0 +1,35 @@
+From 48e9a2fdcae6d373f56aefcb85507758803be7df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 22 Jul 2013 18:49:43 +0200
+Subject: [PATCH] update options in the pkcsconf man page to match the pkcsconf
+ binary
+
+---
+ man/man1/pkcsconf.1.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/man/man1/pkcsconf.1.in b/man/man1/pkcsconf.1.in
+index 1b95651..76293ae 100644
+--- a/man/man1/pkcsconf.1.in
++++ b/man/man1/pkcsconf.1.in
+@@ -4,7 +4,7 @@ pkcsconf \- configuration utility for the pkcsslotd daemon
+ 
+ .SH SYNOPSIS
+ \fBpkcsconf\fP
+-[\fB-itsmMIupPh\fP]
++[\fB-itsmlIupPh\fP]
+ [\fB-c\fP \fIslotnumber\fP \fB-U\fP \fIuserPIN\fP
+ \fB-S\fP \fISOPin\fP \fB-n\fP \fInewpin\fP]
+ 
+@@ -21,6 +21,8 @@ display token info
+ display slot info
+ .IP "\fB-m\fP" 10
+ display mechanism list
++.IP "\fB-l\fP" 10
++display slot description
+ .IP "\fB-I\fP" 10
+ initialize token 
+ .IP "\fB-u\fP" 10
+-- 
+1.8.1.4
+
diff --git a/opencryptoki.spec b/opencryptoki.spec
index 5cbc11d..1206318 100644
--- a/opencryptoki.spec
+++ b/opencryptoki.spec
@@ -3,7 +3,7 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
 Version:		3.0
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		CPL
 Group:			System Environment/Base
 URL:			http://sourceforge.net/projects/opencryptoki
@@ -11,6 +11,9 @@ Source0:		http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
 Source1:		%{name}-tmpfiles.conf
 # https://bugzilla.redhat.com/show_bug.cgi?id=732756
 Patch0:			%{name}-2.4-group.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=948460
+# http://sourceforge.net/mailarchive/message.php?msg_id=31202168
+Patch1:			%{name}-3.0-pkcsconf-man.patch
 Requires(pre):		shadow-utils coreutils sed
 BuildRequires:		openssl-devel
 BuildRequires:		trousers-devel
@@ -151,6 +154,7 @@ cryptographic hardware such as IBM 4764 or 4765 that uses the
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .group
+%patch1 -p1 -b .pkcsconf-man
 
 # Upstream tarball has unnecessary executable perms set on the sources
 find . -name '*.[ch]' -print0 | xargs -0 chmod -x
@@ -281,6 +285,9 @@ exit 0
 
 
 %changelog
+* Tue Jul 23 2013 Dan Horák <dan[at]danny.cz> - 3.0-2
+- update pkcsconf man page (#948460)
+
 * Mon Jul 22 2013 Dan Horák <dan[at]danny.cz> - 3.0-1
 - new upstream release 3.0