From d6e988452f43db9bfeab6a243833c559b4c0cba2 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Aug 27 2015 22:17:12 +0000
Subject: version 1.1.15


- Undo generating $(FILEPREF)-console-ipv4.bat.
- Add the option "-Djava.net.preferIPv4Stack=true" to template.bat directly.

---

diff --git a/build.properties b/build.properties
index 3b0f34d..a275820 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
 
 console.root=.
 console.version=11
-console.dotversion=1.1.14
+console.dotversion=1.1.15
 console.dotgenversion=1.1
 
 theme.core=389-console
diff --git a/win/Makefile b/win/Makefile
index 69e0d7a..dd994b7 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -89,7 +89,6 @@ MOZILLABUILDDIR=c:\mozilla-build
 
 #UZCMD=cscript //nologo unzip.vbs
 UZCMD=$(MOZILLABUILDDIR)\info-zip\unzip.exe -q -o
-SED=$(MOZILLABUILDDIR)\msys\bin\sed.exe
 
 NSPRVER=4.8.4
 NSSVER=3_12_6
@@ -198,7 +197,6 @@ LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\nspr4.dll $(NSSLIBDIR)\nss3.dll $(JSSDIR)\jss4.
 # directory should already contain the bat file, icon, and bitmaps
 	@(echo @echo off&echo set FILEPREF=$(FILEPREF)) > header
 	copy /Y header+template.bat $(PKGDIR)\$(FILEPREF)-console.bat
-	$(SED) -e "s/com.netscape.management.client.console.Console/-Djava.net.preferIPv4Stack=true com.netscape.management.client.console.Console/" $(PKGDIR)\$(FILEPREF)-console.bat > $(PKGDIR)\$(FILEPREF)-console-ipv4.bat
 	del header
 	copy /Y $(ICONDIR)\*.ico $(PKGDIR)
 	copy /Y $(BITMAPDIR)\* $(PKGDIR)\Bitmaps\*
diff --git a/win/VERSION.mak b/win/VERSION.mak
index 4ac88bb..30f196d 100644
--- a/win/VERSION.mak
+++ b/win/VERSION.mak
@@ -7,7 +7,7 @@ BRANDNOSPACE=389
 # this is the vendor or manufacturer
 VENDOR=389 Project
 # the version
-VERSION=1.1.14
+VERSION=1.1.15
 # 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
diff --git a/win/template.bat b/win/template.bat
index df28dfb..c88831a 100644
--- a/win/template.bat
+++ b/win/template.bat
@@ -74,6 +74,6 @@ rem
 rem Launch the Console
 rem
 echo on
-"%JAVA%" "-Djava.library.path=%JSSDIR%" -cp "%JSSDIR%/jss4.jar;%LDAPJARDIR%/ldapjdk.jar;%CONSOLEJARDIR%/idm-console-base.jar;%CONSOLEJARDIR%/idm-console-mcc.jar;%CONSOLEJARDIR%/idm-console-mcc_en.jar;%CONSOLEJARDIR%/idm-console-nmclf.jar;%CONSOLEJARDIR%/idm-console-nmclf_en.jar;%BRANDCONSOLEJARDIR%/%FILEPREF%-console_en.jar" -Djava.util.prefs.systemRoot=%HOME%/.%FILEPREF%-console -Djava.util.prefs.userRoot=%HOME%/.%FILEPREF%-console com.netscape.management.client.console.Console %*
+"%JAVA%" "-Djava.library.path=%JSSDIR%" -cp "%JSSDIR%/jss4.jar;%LDAPJARDIR%/ldapjdk.jar;%CONSOLEJARDIR%/idm-console-base.jar;%CONSOLEJARDIR%/idm-console-mcc.jar;%CONSOLEJARDIR%/idm-console-mcc_en.jar;%CONSOLEJARDIR%/idm-console-nmclf.jar;%CONSOLEJARDIR%/idm-console-nmclf_en.jar;%BRANDCONSOLEJARDIR%/%FILEPREF%-console_en.jar" -Djava.util.prefs.systemRoot=%HOME%/.%FILEPREF%-console -Djava.util.prefs.userRoot=%HOME%/.%FILEPREF%-console -Djava.net.preferIPv4Stack=true com.netscape.management.client.console.Console %*
 
 :end