From 28bb3d451c02fe5b09fe7e0b45c2212042213823 Mon Sep 17 00:00:00 2001
From: "wtchang%redhat.com" <wtchang%redhat.com>
Date: Fri, 29 Apr 2005 21:35:46 +0000
Subject: [PATCH] Updated for the NSPR 4.6 release. Modified Files:
 repackage.sh prinit.h pr/tests/vercheck.c

---
 nsprpub/admin/repackage.sh  |  8 ++++----
 nsprpub/pr/include/prinit.h |  4 ++--
 nsprpub/pr/tests/vercheck.c | 11 ++++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/nsprpub/admin/repackage.sh b/nsprpub/admin/repackage.sh
index 2e0126d636e6..d25b15a5c1d6 100755
--- a/nsprpub/admin/repackage.sh
+++ b/nsprpub/admin/repackage.sh
@@ -64,10 +64,10 @@
 # 
 # ------------------------------------------------------------------
 
-FROMTOP=/share/builds/components/nspr20/v4.5
-TOTOP=./v4.5
-NSPRDIR=nspr-4.5
-SOURCETAG=NSPR_4_5_RTM
+FROMTOP=/share/builds/components/nspr20/v4.6
+TOTOP=./v4.6
+NSPRDIR=nspr-4.6
+SOURCETAG=NSPR_4_6_RTM
 
 #
 # enumerate Unix object directories on /s/b/c
diff --git a/nsprpub/pr/include/prinit.h b/nsprpub/pr/include/prinit.h
index cfe5db291991..70b4567d8b2e 100644
--- a/nsprpub/pr/include/prinit.h
+++ b/nsprpub/pr/include/prinit.h
@@ -63,11 +63,11 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.6 Beta"
+#define PR_VERSION  "4.6"
 #define PR_VMAJOR   4
 #define PR_VMINOR   6
 #define PR_VPATCH   0
-#define PR_BETA     PR_TRUE
+#define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck
diff --git a/nsprpub/pr/tests/vercheck.c b/nsprpub/pr/tests/vercheck.c
index eed5006a566a..d1fdb96ec159 100644
--- a/nsprpub/pr/tests/vercheck.c
+++ b/nsprpub/pr/tests/vercheck.c
@@ -52,13 +52,14 @@
 #include <stdlib.h>
 
 /*
- * This release (4.5) is backward compatible with the
- * 4.0.x, 4.1.x, 4.2.x, 4.3.x, and 4.4.x releases.  It, of course,
+ * This release (4.6) is backward compatible with the
+ * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, and 4.5.x releases.  It, of course,
  * is compatible with itself.
  */
 static char *compatible_version[] = {
     "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3",
-    "4.2", "4.2.1", "4.2.2", "4.3", "4.4", "4.4.1", PR_VERSION
+    "4.2", "4.2.1", "4.2.2", "4.3", "4.4", "4.4.1",
+    "4.5", "4.5.1", PR_VERSION
 };
 
 /*
@@ -73,8 +74,8 @@ static char *incompatible_version[] = {
     "3.0", "3.0.1",
     "3.1", "3.1.1", "3.1.2", "3.1.3",
     "3.5", "3.5.1",
-    "4.5.3",
-    "4.6", "4.6.1",
+    "4.6.3",
+    "4.7", "4.7.1",
     "10.0", "11.1", "12.14.20"
 };