[Fedora-directory-commits] setuputil component_versions.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.7, 1.8

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7489

Modified Files:
	component_versions.mk nsconfig.mk 
Log Message:
[179394] HP-UX IPF/PA-RISC support
NSPR_RELDATE = v4.6
SECURITY_RELDATE = NSS_3_11_RTM
added _ia64 tag to NSCONFIG
replaced --exclude option with more common -X <exclude_file> for tar.



Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/component_versions.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- component_versions.mk	29 Jul 2005 22:16:18 -0000	1.1.1.1
+++ component_versions.mk	23 Feb 2006 21:47:45 -0000	1.2
@@ -34,12 +34,12 @@
 # naming scheme.
 # NSPR
 ifndef NSPR_RELDATE
-  NSPR_RELDATE = v4.4.1
+  NSPR_RELDATE = v4.6
 endif
 
 # SECURITY (NSS) LIBRARY
 ifndef SECURITY_RELDATE
-  SECURITY_RELDATE = NSS_3_9_3_RTM
+  SECURITY_RELDATE = NSS_3_11_RTM
 endif
 
 # DBM Library


Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nsconfig.mk	15 Feb 2006 22:51:00 -0000	1.7
+++ nsconfig.mk	23 Feb 2006 21:47:45 -0000	1.8
@@ -68,8 +68,13 @@
       NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
     endif
     ifeq ($(NSOS_ARCH),HP-UX)
+      ifeq ($(NSOS_TEST1), ia64)
         NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
         NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+      else
+        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)
+        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+      endif
     else
         NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)
         NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)