rpms/coolkey/devel coolkey.spec,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: jkeating

Update of /cvs/dist/rpms/coolkey/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11543

Modified Files:
	coolkey.spec 
Log Message:
Sync changes to the devel branch



Index: coolkey.spec
===================================================================
RCS file: /cvs/dist/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- coolkey.spec	9 Oct 2006 22:41:56 -0000	1.12
+++ coolkey.spec	17 Oct 2006 19:54:25 -0000	1.13
@@ -22,7 +22,7 @@
 
 Name: coolkey
 Version: 1.0.1
-Release: 9
+Release: 10
 Summary: CoolKey PKCS #11 module
 License: LGPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -80,8 +80,9 @@
 /sbin/ldconfig
 isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{coolkey_module} || echo NO`
 if [ "$isThere" == "NO" ]; then
-   echo pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so'
-   pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
+   if [ -x %{_bindir}/pk11install ]; then
+      pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
+   fi
 fi
 
 
@@ -108,10 +109,13 @@
 
 
 %changelog
-* Thu Oct 16 2006 Bob Relyea <rrelyea at redhat.com> - 1.0.1-9
+* Tue Oct 17 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-10
+- Only run pk11install if the binary is there (multilib fun)
+
+* Mon Oct 09 2006 Bob Relyea <rrelyea at redhat.com> - 1.0.1-9
 - use pk11install which does not require loading the module to install it.
 
-* Thu Oct 16 2006 Bob Relyea <rrelyea at redhat.com> - 1.0.1-8
+* Mon Oct 09 2006 Bob Relyea <rrelyea at redhat.com> - 1.0.1-8
 - pcscd must be running in order to add coolkey.
 
 * Thu Oct 4 2006 Bob Relyea <rrelyea at redhat.com> - 1.0.1-7