From f6bd69292a7e2eda3ea501f27cec8c425505e6d1 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: May 11 2010 23:17:22 +0000
Subject: update for nspr 4.8.4, nss 3.12.6, and idm console framework 1.1.5


---

diff --git a/win/Makefile b/win/Makefile
index 281b3d2..ebe40ba 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -89,8 +89,8 @@ SBV=http://filer/components
 #UZCMD=cscript //nologo unzip.vbs
 UZCMD=c:\mozilla-build\info-zip\unzip.exe -q -o
 
-NSPRVER=4.8
-NSSVER=3_12_4
+NSPRVER=4.8.4
+NSSVER=3_12_6
 LDAPJDKVER=4.18
 LDAPJDKVERDIR=4.18/20070817.1
 JSSVER=4_2_6
@@ -99,8 +99,8 @@ JSSVERDIR=JSS_$(JSSVER)_RTM/20091019.1
 !ELSE
 JSSVERDIR=JSS_$(JSSVER)_RTM/20091020.1
 !ENDIF
-IDMVER=1.1
-IDMVERDIR=$(IDMVER)/20090310.1
+IDMVER=1.1.5
+IDMVERDIR=$(IDMVER)/20100503.1
 WIXVER=2.0.5805.0
 
 # where to stage the package layout
diff --git a/win/VERSION.mak b/win/VERSION.mak
index 6116028..ad14b22 100644
--- a/win/VERSION.mak
+++ b/win/VERSION.mak
@@ -7,14 +7,14 @@ BRANDNOSPACE=389
 # this is the vendor or manufacturer
 VENDOR=389 Project
 # the version
-VERSION=1.1.4
+VERSION=1.1.5
 # the name of the product - this is used in the title of the
 # installer, in the name of the folder, and in the name
 # of the shortcuts
 PRODUCTNAME=$(BRAND) Management Console
 # this is the GUID of the package - must be changed
 # when the version is changed - use uuidgen -n1
-PKGGUID=f6570f14-9613-4e40-9e14-450aad257f0e
+PKGGUID=e9874937-a842-4396-bb5a-71cd89d4b5ba
 # the upgrade GUID should usually not be changed
 UPGRADEGUID=7EA828C0-C219-438d-9BB3-3418DC900D60
 # guid of old version to be removed