rpms/nss-softokn/devel nss-softokn-config.in, 1.1, 1.2 nss-softokn.pc.in, 1.2, 1.3 nss-softokn.spec, 1.10, 1.11

[Elio Maldonado]

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27169

Modified Files:
	nss-softokn-config.in nss-softokn.pc.in nss-softokn.spec 
Log Message:
- List freebl, nssdbm and softokn libraries in nss-softokn-config and nss-softokn.pc


Index: nss-softokn-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn-config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-softokn-config.in	19 Aug 2009 23:47:12 -0000	1.1
+++ nss-softokn-config.in	28 Aug 2009 05:15:26 -0000	1.2
@@ -19,6 +19,8 @@ Options:
 	[--libs]
 	[--cflags]
 Dynamic Libraries:
+	freebl3
+	nssdbm3
 	softokn3
 EOF
 	exit $1
@@ -28,10 +30,9 @@ if test $# -eq 0; then
 	usage 1 1>&2
 fi
 
-lib_ssl=no
-lib_smime=no
-lib_nss=no
-lib_nssutil=yes
+lib_freebl=yes
+lib_nssdbm=yes
+lib_softokn=yes
 
 while test $# -gt 0; do
   case "$1" in
@@ -73,17 +74,14 @@ while test $# -gt 0; do
     --libs)
       echo_libs=yes
       ;;
-    ssl)
-      lib_ssl=no
+    freebl)
+      lib_freebl=yes
       ;;
-    smime)
-      lib_smime=no
+    nssdbm)
+      lib_nssdbm=yes
       ;;
-    nss)
-      lib_nss=no
-      ;;
-    nssutil)
-      lib_nssutil=yes
+    softokn)
+      lib_softokn=no
       ;;
     *)
       usage 1 1>&2
@@ -128,14 +126,14 @@ if test "$echo_libs" = "yes"; then
       if test -n "$lib_ssl"; then
 	libdirs="$libdirs -lssl${major_version}"
       fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
+      if test -n "$lib_freebl"; then
+	libdirs="$libdirs -lfreebl${major_version}"
       fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
+      if test -n "$lib_nssdbm"; then
+	libdirs="$libdirs -lnssdbm${major_version}"
       fi
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
+      if test -n "$lib_softokn"; then
+	libdirs="$libdirs -lnsoftokn${major_version}"
       fi
       echo $libdirs
 fi      


Index: nss-softokn.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.pc.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-softokn.pc.in	26 Aug 2009 22:17:49 -0000	1.2
+++ nss-softokn.pc.in	28 Aug 2009 05:15:27 -0000	1.3
@@ -3,8 +3,9 @@ exec_prefix=%exec_prefix%
 libdir=%libdir%
 includedir=%includedir%
 
-Name: SOFTKN
+Name: NSS-SOFTOKN
 Description: Network Security Services Softoken PKCS #11 Module
 Version: %SOFTOKEN_VERSION%
 Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
+Libs: -lfreebl3 -lnssdbm3 -lsoftokn3
 Cflags: -I${includedir}


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nss-softokn.spec	27 Aug 2009 23:09:53 -0000	1.10
+++ nss-softokn.spec	28 Aug 2009 05:15:27 -0000	1.11
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          19%{?dist}
+Release:          20%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -310,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-20
+- List freebl, nssdbm and softokn libraries in nss-softokn-config and nss-softokn.pc
+
 * Thu Aug 27 2009 Elio Maldonado@<emaldona at redhat.com> - 3.12.3.99.3-19
 - Determine NSSUTIL_INCLUDE_DIR and NSSUTIL_LIB_DIR with a pkg-config query on nss-util
 - Remove the release 17 hack