[nss-util] Update the build-nss-util-only.patch and the spec file

[Elio Maldonado]

commit 27cb2d294b46ed00afd089a91f23008bc7ba80bd
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed May 29 15:49:36 2013 -0700

    Update the build-nss-util-only.patch and the spec file
    
    - build-nss-util-only.patch updated on account of the code movement upstream and simpilified
    - using NSS_BUILD_NSSUTIL_ONLY as a more descriptive name and in the style of the one for softoken
    - with this cleanup this patch could be submitted upstream and not have to maintain it here

 build-nss-util-only.patch |   41 ++++++++++++++++++++---------------------
 nss-util.spec             |    4 ++--
 2 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/build-nss-util-only.patch b/build-nss-util-only.patch
index 1c02262..4005d9a 100644
--- a/build-nss-util-only.patch
+++ b/build-nss-util-only.patch
@@ -1,14 +1,14 @@
 diff -up nss/cmd/manifest.mn.utilonly nss/cmd/manifest.mn
---- nss/cmd/manifest.mn.utilonly	2013-04-04 17:32:28.000000000 -0700
-+++ nss/cmd/manifest.mn	2013-04-04 17:42:10.568511130 -0700
-@@ -8,55 +8,6 @@ DEPTH	= ..
+--- nss/cmd/manifest.mn.utilonly	2013-05-29 15:34:19.634715650 -0700
++++ nss/cmd/manifest.mn	2013-05-29 15:35:25.460227028 -0700
+@@ -8,55 +8,7 @@ DEPTH	= ..
  
  REQUIRES = nss nspr libdbm
  
 -DIRS = lib  \
 - addbuiltin \
 - atob  \
-- bltest \
+- $(BLTEST_SRCDIR) \
 - btoa  \
 - certcgi \
 - certutil  \
@@ -20,7 +20,7 @@ diff -up nss/cmd/manifest.mn.utilonly nss/cmd/manifest.mn
 - derdump  \
 - digest  \
 - httpserv  \
-- fipstest  \
+- $(FIPSTEST_SRCDIR)  \
 - $(LOWHASHTEST_SRCDIR)  \
 - listsuites \
 - makepqg  \
@@ -44,7 +44,7 @@ diff -up nss/cmd/manifest.mn.utilonly nss/cmd/manifest.mn
 - selfserv  \
 - signtool \
 - signver \
-- shlibsign \
+- $(SHLIBSIGN_SRCDIR) \
 - smimetools  \
 - ssltap  \
 - strsclnt \
@@ -54,35 +54,35 @@ diff -up nss/cmd/manifest.mn.utilonly nss/cmd/manifest.mn
 - vfychain \
 - vfyserv \
 - modutil \
++DIRS =  \
   $(NULL)
  
  TEMPORARILY_DONT_BUILD = \
 diff -up nss/lib/Makefile.utilonly nss/lib/Makefile
---- nss/lib/Makefile.utilonly	2013-04-04 17:32:28.000000000 -0700
-+++ nss/lib/Makefile	2013-04-04 17:39:08.424685596 -0700
-@@ -46,6 +46,14 @@ ifndef NSS_DISABLE_DBM
+--- nss/lib/Makefile.utilonly	2013-05-29 15:36:49.223876575 -0700
++++ nss/lib/Makefile	2013-05-29 15:39:52.052290168 -0700
+@@ -46,6 +46,10 @@ ifndef NSS_DISABLE_DBM
  DBM_SRCDIR = dbm  # Add the dbm directory to DIRS.
  endif
  
-+ifndef MOZILLA_CLIENT
-+ifeq ($(OS_ARCH),Linux)
-+ifneq ($(NSS_BUILD_NSSUTIL),1)
++ifeq ($(NSS_BUILD_NSSUTIL_ONLY),1)
 +SYSINIT_SRCDIR=
 +endif
-+endif
-+endif
 +
  #######################################################################
  # (5) Execute "global" rules. (OPTIONAL)                              #
  #######################################################################
 diff -up nss/lib/manifest.mn.utilonly nss/lib/manifest.mn
---- nss/lib/manifest.mn.utilonly	2013-04-04 17:32:28.000000000 -0700
-+++ nss/lib/manifest.mn	2013-04-04 17:40:18.376387819 -0700
-@@ -16,14 +16,7 @@ DEPTH      = ..
- #  smime
- #  ckfw (builtins module)
+--- nss/lib/manifest.mn.utilonly	2013-05-29 15:40:21.073514078 -0700
++++ nss/lib/manifest.mn	2013-05-29 15:41:24.308001547 -0700
+@@ -18,17 +18,6 @@ DEPTH      = ..
  #  crmf jar (not dll's)
--DIRS =  util freebl $(SQLITE_SRCDIR) $(DBM_SRCDIR) softoken \
+ DIRS = \
+ 	$(UTIL_SRCDIR) \
+-	$(FREEBL_SRCDIR) \
+-	$(SQLITE_SRCDIR) \
+-	$(DBM_SRCDIR) \
+-	$(SOFTOKEN_SRCDIR) \
 -	base dev pki \
 -	libpkix \
 -	certdb certhigh pk11wrap cryptohi nss \
@@ -90,7 +90,6 @@ diff -up nss/lib/manifest.mn.utilonly nss/lib/manifest.mn
 -	pkcs12 pkcs7 smime \
 -	crmf jar \
 -	ckfw $(SYSINIT_SRCDIR) \
-+DIRS =  util \
  	$(NULL)
  
  #  fortcrypt  is no longer built
diff --git a/nss-util.spec b/nss-util.spec
index ef5754b..e0c6050 100644
--- a/nss-util.spec
+++ b/nss-util.spec
@@ -94,8 +94,8 @@ export NSPR_LIB_DIR
 NSS_USE_SYSTEM_SQLITE=1
 export NSS_USE_SYSTEM_SQLITE
 
-NSS_BUILD_NSSUTIL=1
-export NSS_BUILD_NSSUTIL
+NSS_BUILD_NSSUTIL_ONLY=1
+export NSS_BUILD_NSSUTIL_ONLY
 
 %ifarch x86_64 ppc64 ia64 s390x sparc64 aarch64
 USE_64=1