rpms/nss-softokn/devel nss-softokn-config.in, 1.3, 1.4 nss-softokn.spec, 1.23, 1.24

[Elio Maldonado]

Author: emaldonado

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

Modified Files:
	nss-softokn-config.in nss-softokn.spec 
Log Message:
Delist libraries from nss-softoken-config


Index: nss-softokn-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn-config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-softokn-config.in	5 Sep 2009 21:21:21 -0000	1.3
+++ nss-softokn-config.in	10 Sep 2009 23:43:31 -0000	1.4
@@ -19,9 +19,10 @@ Options:
 	[--libs]
 	[--cflags]
 Dynamic Libraries:
-	freebl3
-	nssdbm3
-	softokn3
+	softokn3 - Requires full dynamic linking
+	freebl3  - for internal use only (and glibc for self-integrity check)
+	nssdbm3  - for internal use only
+Dymamically linked
 EOF
 	exit $1
 }
@@ -30,10 +31,6 @@ if test $# -eq 0; then
 	usage 1 1>&2
 fi
 
-lib_freebl=yes
-lib_nssdbm=yes
-lib_softokn=yes
-
 while test $# -gt 0; do
   case "$1" in
   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -74,15 +71,6 @@ while test $# -gt 0; do
     --libs)
       echo_libs=yes
       ;;
-    freebl)
-      lib_freebl=yes
-      ;;
-    nssdbm)
-      lib_nssdbm=yes
-      ;;
-    softokn)
-      lib_softokn=no
-      ;;
     *)
       usage 1 1>&2
       ;;
@@ -122,19 +110,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_freebl"; then
-	libdirs="$libdirs -lfreebl${major_version}"
-      fi
-      if test -n "$lib_nssdbm"; then
-	libdirs="$libdirs -lnssdbm${major_version}"
-      fi
-      if test -n "$lib_softokn"; then
-	libdirs="$libdirs -lnsoftokn${major_version}"
-      fi
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
       echo $libdirs
 fi      
 


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- nss-softokn.spec	8 Sep 2009 18:10:38 -0000	1.23
+++ nss-softokn.spec	10 Sep 2009 23:43:31 -0000	1.24
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          5%{?dist}
+Release:          6%{?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
+* Thu Sep 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-6
+- Don't list libraries in nss-softokn-config, dynamic linking required
+
 * Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-5
 - Installing shared libraries to %%{_libdir}