rpms/coolkey/devel coolkey.spec,1.25,1.26

[Jack Magne (jmagne)]

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32483

Modified Files:
	coolkey.spec 
Log Message:
Include patch for moving the cache directory to a safe location. Resolves #299481, related #301031.



Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- coolkey.spec	21 Aug 2007 01:25:01 -0000	1.25
+++ coolkey.spec	27 Sep 2007 23:43:05 -0000	1.26
@@ -22,18 +22,19 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 4%{dist}
+Release: 5%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
 Source: coolkey-%{version}.tar.gz
+Patch1: coolkey-cache-dir-move.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: pcsc-lite-devel
 BuildRequires: zlib-devel
 BuildRequires: mozilla-nss-devel
-#Requires: nss-tools
+Requires: nss-tools
 Requires: pcsc-lite 
 Requires: pcsc-lite-libs
 Requires: ifd-egate
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch1 -b .cache.dir.move
 
 %build
 autoconf
@@ -66,25 +68,26 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
+mkdir -p $RPM_BUILD_ROOT/var/cache/coolkey
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-#isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{coolkey_module} || echo NO`
-#if [ "$isThere" == "NO" ]; then
-#   if [ -x %{_bindir}/pk11install ]; then
-#      pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
-#   fi
-#fi
+isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{coolkey_module} || echo NO`
+if [ "$isThere" == "NO" ]; then
+   if [ -x %{_bindir}/pk11install ]; then
+      pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
+   fi
+fi
 
 
 %postun
 /sbin/ldconfig
-#if [ $1 -eq 0 ]; then
-#   modutil -delete %{coolkey_module} -dbdir %{nssdb} -force || :
-#fi
+if [ $1 -eq 0 ]; then
+   modutil -delete %{coolkey_module} -dbdir %{nssdb} -force || :
+fi
 
 
 %files
@@ -103,6 +106,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jack Magne <jmagne at redhat.com>  - 1.1.0-5
+- Include patch for moving the cache directory to a safe location. 
+- Bug #299481.
 * Fri Aug 20 2007 Bob Relyea <rrelyea at redhat.com> - 1.1.0-4
 - Update License description to the new Fedora standard