From 90b81b92066f03593ef498a83b1c12d2fa9b5d65 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <michich@fedoraproject.org>
Date: Wed, 27 Jan 2010 15:07:54 +0000
Subject: [PATCH] - New upstream release 2.3.1. -
 opencryptoki-2.3.0-fix-nss-breakage.patch was merged.

---
 .cvsignore        |  2 +-
 opencryptoki.spec | 10 ++++++----
 sources           |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ecc8827..35b8aeb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-opencryptoki-2.3.0.tar.gz
+opencryptoki-2.3.1.tar.gz
diff --git a/opencryptoki.spec b/opencryptoki.spec
index 5b79a1e..e9dfb46 100644
--- a/opencryptoki.spec
+++ b/opencryptoki.spec
@@ -1,13 +1,12 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
-Version:		2.3.0
-Release:		5%{?dist}
+Version:		2.3.1
+Release:		1%{?dist}
 License:		CPL
 Group:			System Environment/Base
 URL:			http://sourceforge.net/projects/opencryptoki
 Source:			http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}-2.2.8-do-not-create-group-in-pkcs11_startup.patch
-Patch1:			%{name}-2.3.0-fix-nss-breakage.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=522149
 Patch2:			%{name}-2.3.0-lsb.patch
 BuildRoot:		%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -49,7 +48,6 @@ based applications.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 %build
@@ -141,6 +139,10 @@ exit 0
 
 
 %changelog
+* Wed Jan 27 2010 Michal Schmidt <mschmidt@redhat.com> 2.3.1-1
+- New upstream release 2.3.1.
+- opencryptoki-2.3.0-fix-nss-breakage.patch was merged.
+
 * Fri Jan 22 2010 Dan Horák <dan[at]danny.cz> 2.3.0-5
 - made pkcsslotd initscript LSB compliant (#522149)
 
diff --git a/sources b/sources
index 5c961a4..514ff59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-107d27f53dc0bcace678154e326c7f87  opencryptoki-2.3.0.tar.gz
+1b4690b52210574fcee69adbcb0f40fb  opencryptoki-2.3.1.tar.gz