From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 15 Oct 2010 19:18:55 +0000 (+0200)
Subject: nss: Depend on nss-softokn.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2adfd375e04ea2af12428342b69b714efe4823b;p=ipfire-3.x.git

nss: Depend on nss-softokn.
---

diff --git a/pkgs/core/nss/nss.nm b/pkgs/core/nss/nss.nm
index 21329cded..f4e866d98 100644
--- a/pkgs/core/nss/nss.nm
+++ b/pkgs/core/nss/nss.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = nss
 PKG_VER        = 3.12.8
-PKG_REL        = 1
+PKG_REL        = 2
 
 PKG_MAINTAINER =
 PKG_GROUP      = System/Libraries
@@ -34,8 +34,8 @@ PKG_URL        = http://www.mozilla.org/projects/security/pki/nss/
 PKG_LICENSE    = MPLv1.1 or GPLv2+ or LGPLv2+
 PKG_SUMMARY    = Network Security Services.
 
-PKG_BUILD_DEPS+= nspr-devel nss-util-devel perl pkg-config psmisc sqlite-devel \
-	zlib-devel
+PKG_BUILD_DEPS+= nspr-devel nss-softokn-devel nss-util-devel perl pkg-config \
+	psmisc sqlite-devel zlib-devel
 
 define PKG_DESCRIPTION
 	Network Security Services (NSS) is a set of libraries designed to \
@@ -50,7 +50,7 @@ PKG_OBJECTS   += nss-pem-20100809.tar.bz2
 
 PKG_PACKAGES  += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-libs
 
-PKG_DEPS-$(PKG_NAME_REAL)-devel += nss-util-devel
+PKG_DEPS-$(PKG_NAME_REAL)-devel += nss-softokn-devel nss-util-devel
 
 # Mozilla does no versioning :(
 define PKG_FILES-$(PKG_NAME_REAL)-devel
@@ -177,7 +177,7 @@ define STAGE_INSTALL
 		-e "s,%NSS_VERSION%,$(PKG_VER),g" \
 		-e "s,%NSPR_VERSION%,$$(nspr-config --version),g" \
 		-e "s,%NSSUTIL_VERSION%,$$(nss-util-config --version),g" \
-#		-e "s,%SOFTOKEN_VERSION%,%{nss_softokn_version},g" \
+		-e "s,%SOFTOKEN_VERSION%,$$(nss-softokn-config --version),g" \
 		< $(DIR_SOURCE)/nss.pc.in \
 		> $(BUILDROOT)/usr/lib/pkgconfig/nss.pc