rpms/nss-softokn/F-12 nss-softokn-config.in, 1.4, 1.5 nss-softokn.spec, 1.27, 1.28

[Elio Maldonado]

Author: emaldonado

Update of /cvs/pkgs/rpms/nss-softokn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12482

Modified Files:
	nss-softokn-config.in nss-softokn.spec 
Log Message:
Fix nss-softokn-config to actually use the nss-sofotkn package, not the nss package


Index: nss-softokn-config.in
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-12/nss-softokn-config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-softokn-config.in	10 Sep 2009 23:43:31 -0000	1.4
+++ nss-softokn-config.in	19 Jan 2010 01:36:16 -0000	1.5
@@ -80,13 +80,13 @@ done
 
 # Set variables that may be dependent upon other variables
 if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
+    exec_prefix=`pkg-config --variable=exec_prefix nss-softokn`
 fi
 if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
+    includedir=`pkg-config --variable=includedir nss-softokn`
 fi
 if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
+    libdir=`pkg-config --variable=libdir nss-softokn`
 fi
 
 if test "$echo_prefix" = "yes"; then


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-12/nss-softokn.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nss-softokn.spec	23 Sep 2009 16:17:57 -0000	1.27
+++ nss-softokn.spec	19 Jan 2010 01:36:16 -0000	1.28
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          10%{?dist}
+Release:          11%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -290,6 +290,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Mon Jan 18 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-11
+- fix in nss-softokn-spec.in 
+
 * Tue Sep 23 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-10
 - Fix paths in nss-softokn-prelink so signed libraries don't get touched, rhbz#524794