[opencryptoki] %{?_isa} does not work in Obsoletes

[Michal Schmidt]

commit cad24246350deb80a1f2f74b8bdec17c23891eb2
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Nov 9 09:58:22 2010 +0100

    %{?_isa} does not work in Obsoletes
    
    According to my testing, Obsoletes only apply to package names, not
    provides.
    The upgrade path now works.

 opencryptoki.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/opencryptoki.spec b/opencryptoki.spec
index a94594c..8b257e7 100644
--- a/opencryptoki.spec
+++ b/opencryptoki.spec
@@ -1,7 +1,7 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
 Version:		2.3.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		CPL
 Group:			System Environment/Base
 URL:			http://sourceforge.net/projects/opencryptoki
@@ -35,7 +35,7 @@ This package contains the Slot Daemon (pkcsslotd) and general utilities.
 %package libs
 Group:			System Environment/Libraries
 Summary:		The run-time libraries for opencryptoki package
-Obsoletes:		%{name}-libs%{?_isa} < 2.3.2
+Obsoletes:		%{name}-libs < 2.3.2
 
 %description libs
 Opencryptoki implements the PKCS#11 specification v2.11 for a set of
@@ -62,7 +62,7 @@ opencryptoki and PKCS#11 based applications
 Group:			System Environment/Libraries
 Summary:		The software token implementation for opencryptoki
 Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
-Obsoletes:		%{name}-libs%{?_isa} < 2.3.2
+Obsoletes:		%{name}-libs < 2.3.2
 
 %description swtok
 Opencryptoki implements the PKCS#11 specification v2.11 for a set of
@@ -78,7 +78,7 @@ without any specific cryptographic hardware.
 Group:			System Environment/Libraries
 Summary:		Trusted Platform Module (TPM) device support for opencryptoki
 Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
-Obsoletes:		%{name}-libs%{?_isa} < 2.3.2
+Obsoletes:		%{name}-libs < 2.3.2
 
 %description tpmtok
 Opencryptoki implements the PKCS#11 specification v2.11 for a set of
@@ -95,7 +95,7 @@ Trusted Platform Module (TPM) devices in the opencryptoki stack.
 Group:			System Environment/Libraries
 Summary:		ICA cryptographic devices (clear-key) support for opencryptoki
 Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
-Obsoletes:		%{name}-libs%{?_isa} < 2.3.2
+Obsoletes:		%{name}-libs < 2.3.2
 
 %description icatok
 Opencryptoki implements the PKCS#11 specification v2.11 for a set of
@@ -112,7 +112,7 @@ cryptographic hardware such as IBM 4764 or 4765 that uses the
 Group:			System Environment/Libraries
 Summary:		CCA cryptographic devices (secure-key) support for opencryptoki
 Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
-Obsoletes:		%{name}-libs%{?_isa} < 2.3.2
+Obsoletes:		%{name}-libs < 2.3.2
 
 %description ccatok
 Opencryptoki implements the PKCS#11 specification v2.11 for a set of
@@ -262,6 +262,9 @@ exit 0
 
 
 %changelog
+* Tue Nov 09 2010 Michal Schmidt <mschmidt at redhat.com> 2.3.2-2
+- Apply Obsoletes to package names, not provides.
+
 * Tue Sep 14 2010 Dan Horák <dan[at]danny.cz> 2.3.2-1
 - new upstream release 2.3.2
 - put STDLLs in separate packages to match upstream package design