[Pkg-fedora-ds-maintainers] 389-console: Changes to 'upstream'

Timo Aaltonen tjaalton at moszumanska.debian.org
Tue Aug 30 22:51:55 UTC 2016 

 build.properties |    2 +-
 build.xml        |    8 ++++----
 win/Console.wxs  |   10 +++++++---
 win/Makefile     |    6 +++---
 win/VERSION.mak  |    6 +++---
 win/build.bat    |    4 ++--
 win/template.bat |    2 +-
 7 files changed, 21 insertions(+), 17 deletions(-)

New commits:
commit 77d9e6a8d2536bd089d60e27b488f2a51370521e
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Fri Jul 15 20:58:18 2016 -0700

    version 1.1.17
    
    Fixing a wrong dir name man.8 to man8.
    Note: win/VERSION.mak -- since 389-console-win-1.1.16 is not built,
          PKGGUID is not touched.

diff --git a/build.properties b/build.properties
index e968e7a..6932803 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
 
 console.root=.
 console.version=11
-console.dotversion=1.1.16
+console.dotversion=1.1.17
 console.dotgenversion=1.1
 
 theme.core=389-console
diff --git a/build.xml b/build.xml
index 8f7c4e0..7e150b3 100644
--- a/build.xml
+++ b/build.xml
@@ -42,8 +42,8 @@ END COPYRIGHT BLOCK
     <property name="need_libdir"            value=""/>
     <property name="man.dir"                value="/usr/share/man"/>
 
-    <mkdir dir="${man.dir}"/>
-    <mkdir dir="${man.dir}/man.8"/>
+    <mkdir dir="${built.dir}/${man.dir}"/>
+    <mkdir dir="${built.dir}/${man.dir}/man8"/>
 
     <!-- Verify that the required jars exist -->
     <fail message="LDAP JDK (${ldapjdk.jar.name}) does not exist in ${ldapjdk.local.location}">
@@ -122,7 +122,7 @@ END COPYRIGHT BLOCK
   </target>
   <target name="buildman">
     <!-- Man Page -->
-    <copy file="389-console.8" tofile="${man.dir}/man8/389-console.8"/>
-    <chmod file="${man.dir}/man8/389-console.8" perm="644"/>
+    <copy file="389-console.8" tofile="${built.dir}/${man.dir}/man8/389-console.8"/>
+    <chmod file="${built.dir}/${man.dir}/man8/389-console.8" perm="644"/>
   </target>
 </project>
diff --git a/win/VERSION.mak b/win/VERSION.mak
index 6c8c80f..420d261 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.16
+VERSION=1.1.17
 # 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

commit 6811bc4820a6ad7cd078c96c19d61e6c26562afe
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Wed May 11 15:38:03 2016 -0700

    version 1.1.16
    
    Updated the value of PKGGUID and OLDGUID with uuidgen.

diff --git a/build.properties b/build.properties
index a275820..e968e7a 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
 
 console.root=.
 console.version=11
-console.dotversion=1.1.15
+console.dotversion=1.1.16
 console.dotgenversion=1.1
 
 theme.core=389-console
diff --git a/win/VERSION.mak b/win/VERSION.mak
index 30f196d..6c8c80f 100644
--- a/win/VERSION.mak
+++ b/win/VERSION.mak
@@ -7,18 +7,18 @@ BRANDNOSPACE=389
 # this is the vendor or manufacturer
 VENDOR=389 Project
 # the version
-VERSION=1.1.15
+VERSION=1.1.16
 # 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=595875D5-C97E-442B-8C8C-66DD2A4583B4
+PKGGUID=DF505B7B-9D6A-4F39-8E50-A26434B05C02
 # the upgrade GUID should usually not be changed
 UPGRADEGUID=7EA828C0-C219-438d-9BB3-3418DC900D60
 # guid of old version to be removed
-OLDGUID=3D26B463-9543-49F3-954E-C9AA3A76EC3A
+OLDGUID=595875D5-C97E-442B-8C8C-66DD2A4583B4
 OLDSHORTCUT=Fedora IDM Console.lnk
 OLDPROGRAMFOLDER=Fedora Identity Management Console
 # filename prefix for certain branded jar and script files

commit d6e988452f43db9bfeab6a243833c559b4c0cba2
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Thu Aug 27 15:17:12 2015 -0700

    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

commit 4ac9671afab270415bcbf60e8b7c7397cd6be2de
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Wed Aug 12 10:06:15 2015 -0700

    version 1.1.14
    
    - Generates $(FILEPREF)-console-ipv4.bat on the fly with the java
      option "-Djava.net.preferIPv4Stack=true"
      mozilla sed does not take '-i'.

diff --git a/build.properties b/build.properties
index 3b83aac..3b0f34d 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
 
 console.root=.
 console.version=11
-console.dotversion=1.1.13
+console.dotversion=1.1.14
 console.dotgenversion=1.1
 
 theme.core=389-console
diff --git a/win/Makefile b/win/Makefile
index 53694b2..69e0d7a 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -198,8 +198,7 @@ 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
-	copy /Y header+template.bat $(PKGDIR)\$(FILEPREF)-console-ipv4.bat
-	$(SED) -i -e "s/com.netscape.management.client.console.Console/-Djava.net.preferIPv4Stack=true &/" $(PKGDIR)\$(FILEPREF)-console-ipv4.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 c09d2ca..4ac88bb 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.13
+VERSION=1.1.14
 # 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

commit 94583251602a6c09ca0f521aac773b022b09bdcc
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Tue Aug 11 14:13:32 2015 -0700

    version 1.1.13
    
    - Generates $(FILEPREF)-console-ipv4.bat on the fly with the java
      option "-Djava.net.preferIPv4Stack=true"

diff --git a/build.properties b/build.properties
index b34dc8d..3b83aac 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
 
 console.root=.
 console.version=11
-console.dotversion=1.1.12
+console.dotversion=1.1.13
 console.dotgenversion=1.1
 
 theme.core=389-console
diff --git a/win/Makefile b/win/Makefile
index dd994b7..53694b2 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -89,6 +89,7 @@ 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
@@ -197,6 +198,8 @@ 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
+	copy /Y header+template.bat $(PKGDIR)\$(FILEPREF)-console-ipv4.bat
+	$(SED) -i -e "s/com.netscape.management.client.console.Console/-Djava.net.preferIPv4Stack=true &/" $(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 7e58e64..c09d2ca 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.12
+VERSION=1.1.13
 # 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

commit a66829ef0d8fab0ad822f695c7be0205acca087d
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Fri Jul 10 16:34:44 2015 -0700

    version 1.1.12
    
    - Separate PolicyCRT from CRT in WixMerge.
      Note: there is not policy msm in MSVC 11 C:\Program Files (x86)\Common Files\Merge Modules

diff --git a/build.properties b/build.properties
index a8f5ed0..b34dc8d 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
 
 console.root=.
 console.version=11
-console.dotversion=1.1.11
+console.dotversion=1.1.12
 console.dotgenversion=1.1
 
 theme.core=389-console
diff --git a/win/Console.wxs b/win/Console.wxs
index 885d35b..d0cf35d 100644
--- a/win/Console.wxs
+++ b/win/Console.wxs
@@ -303,6 +303,10 @@
 <?if $(var.CRTMSM) AND ($(var.CRTMSM) != $(var.EMPTY)) ?>
      <Feature Id='CRT_WinSXS' Title='CRT WinSXS' AllowAdvertise="no" Display="hidden" Level='1'>
         <MergeRef Id='CRT' />
+     </Feature>
+<?endif ?>
+<?if $(var.POLICYCRTMSM) AND ($(var.POLICYCRTMSM) != $(var.EMPTY)) ?>
+     <Feature Id='CRT_WinSXS' Title='CRT WinSXS' AllowAdvertise="no" Display="hidden" Level='1'>
 	    <MergeRef Id='PolicyCRT' />
      </Feature>
 <?endif ?>
diff --git a/win/VERSION.mak b/win/VERSION.mak
index c97e041..7e58e64 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.11
+VERSION=1.1.12
 # 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

commit 29bc6470563ebdd306abc14f53a28f21b3c9eb14
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Fri Jul 10 14:05:10 2015 -0700

    version 1.1.11
    
    - change the nspr library name for windows (win/{Console.wxs,Makefile}).
        libnspr4.dll -> nspr4.dll
        libplds4.dll -> plds4.dll
        libplc4.dll  -> plc4.dll
    - Removed unused NOMSM from win/build.bat.

diff --git a/build.properties b/build.properties
index 4b6529d..a8f5ed0 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
 
 console.root=.
 console.version=11
-console.dotversion=1.1.10
+console.dotversion=1.1.11
 console.dotgenversion=1.1
 
 theme.core=389-console
diff --git a/win/Console.wxs b/win/Console.wxs
index 6ceb669..885d35b 100644
--- a/win/Console.wxs
+++ b/win/Console.wxs
@@ -148,15 +148,15 @@
         <Directory Id='INSTALLDIR' Name='$(var.PRODUCTNAME)'>
 
           <Component Id='NSPRLibrary' Guid='DE133754-3C99-49e7-8A71-0375AB348CDD' Win64='$(var.Property_Win64)'>
-            <File Id='NSPR' DiskId='1' Source='libnspr4.dll' Vital='yes' />
+            <File Id='NSPR' DiskId='1' Source='nspr4.dll' Vital='yes' />
           </Component>
 
           <Component Id='NSPRpldsLibrary' Guid='7DCDBD30-DC5B-4c89-BD94-EE55E1D9D082' Win64='$(var.Property_Win64)'>
-            <File Id='NSPRPLDS' DiskId='1' Source='libplds4.dll' Vital='yes' />
+            <File Id='NSPRPLDS' DiskId='1' Source='plds4.dll' Vital='yes' />
           </Component>
 
           <Component Id='NSPRplcLibrary' Guid='4E707871-BA8E-41e2-982E-E3E79E85A599' Win64='$(var.Property_Win64)'>
-            <File Id='NSPRPLC' DiskId='1' Source='libplc4.dll' Vital='yes' />
+            <File Id='NSPRPLC' DiskId='1' Source='plc4.dll' Vital='yes' />
           </Component>
 
           <Component Id='NSSLibrary' Guid='3196F339-901E-42c4-AAD3-704775DCF5F4' Win64='$(var.Property_Win64)'>
diff --git a/win/Makefile b/win/Makefile
index d6e6379..dd994b7 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -154,7 +154,7 @@ $(NSPRDIR) $(NSSDIR) $(JSSDIR) $(LDAPDIR) $(IDMDIR) $(CONSOLEDIR) $(WIXDIR):
 $(NSPRDIR)\mdbinary.jar : $(NSPRDIR)
 	if not exist $@ $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/$(@F) %%CD%%\$@
 
-$(NSPRLIBDIR)\libnspr4.dll : $(NSPRDIR)\mdbinary.jar
+$(NSPRLIBDIR)\nspr4.dll : $(NSPRDIR)\mdbinary.jar
 	$(UZCMD) $? -d $(?D)
 
 $(NSSDIR)\mdbinary.jar : $(NSSDIR)
@@ -184,7 +184,7 @@ $(CONSOLEDIR)\$(FILEPREF)-console_en.jar : $(CONSOLEDIR)
 #$(PKGDIR)\$(CANDLE) : $(WIXDIR)\wix-$(WIXVER).zip
 #	$(UZCMD) $? -d $(?D)
 
-LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\libnspr4.dll $(NSSLIBDIR)\nss3.dll $(JSSDIR)\jss4.dll $(JSSDIR)\jss4.jar $(LDAPDIR)\ldapjdk.jar $(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-console-mcc_en.jar $(IDMDIR)\idm-console-nmclf.jar $(IDMDIR)\idm-console-nmclf_en.jar $(CONSOLEDIR)\$(FILEPREF)-console_en.jar
+LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\nspr4.dll $(NSSLIBDIR)\nss3.dll $(JSSDIR)\jss4.dll $(JSSDIR)\jss4.jar $(LDAPDIR)\ldapjdk.jar $(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-console-mcc_en.jar $(IDMDIR)\idm-console-nmclf.jar $(IDMDIR)\idm-console-nmclf_en.jar $(CONSOLEDIR)\$(FILEPREF)-console_en.jar
 	copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR)
 	copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR)
 	copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR)
diff --git a/win/VERSION.mak b/win/VERSION.mak
index ab14364..c97e041 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.10
+VERSION=1.1.11
 # 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/build.bat b/win/build.bat
index ae425b1..d48ed7d 100644
--- a/win/build.bat
+++ b/win/build.bat
@@ -64,7 +64,7 @@ if not defined CRTMSM (
 )
 
 if not defined CRTMSM (
-   if not defined NOMSM (
+   if not defined POLICYCRTMSM (
       echo ERROR: could not find the merge modules for the Visual C++
       echo runtime side by side assemblies - they should be provided
       echo with the Visual Studio C++ and/or the Windows SDK
@@ -78,4 +78,4 @@ if not defined CRTMSM (
    echo Visual C++ Redistributable Package, and install it
 )
 
-nmake /nologo NOMSM=%NOMSM% CRTMSM=%CRTMSM% POLICYCRTMSM=%POLICYCRTMSM%
+nmake /nologo CRTMSM=%CRTMSM% POLICYCRTMSM=%POLICYCRTMSM%

commit 43e3ebcdce1f679b1e98ad881c7da0a98b6c1df2
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Wed Jun 24 12:59:25 2015 -0700

    version 1.1.10

diff --git a/build.properties b/build.properties
index a2ed0c1..4b6529d 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
 
 console.root=.
 console.version=11
-console.dotversion=1.1.9
+console.dotversion=1.1.10
 console.dotgenversion=1.1
 
 theme.core=389-console
diff --git a/win/Makefile b/win/Makefile
index b0e9083..d6e6379 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -58,7 +58,7 @@ MSMPLAT=x86
 !IF "$(APPVER)" == "6.0"
 WINVER=8.0
 !ELSE
-WINVER=5.2
+WINVER=6.1
 !ENDIF
 
 !IF "$(BUILD_DEBUG)" == "optimize"
diff --git a/win/VERSION.mak b/win/VERSION.mak
index 8bbc1df..ab14364 100644
--- a/win/VERSION.mak
+++ b/win/VERSION.mak
@@ -7,18 +7,18 @@ BRANDNOSPACE=389
 # this is the vendor or manufacturer
 VENDOR=389 Project
 # the version
-VERSION=1.1.7
+VERSION=1.1.10
 # 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=3D26B463-9543-49F3-954E-C9AA3A76EC3A
+PKGGUID=595875D5-C97E-442B-8C8C-66DD2A4583B4
 # the upgrade GUID should usually not be changed
 UPGRADEGUID=7EA828C0-C219-438d-9BB3-3418DC900D60
 # guid of old version to be removed
-OLDGUID=36C8F6DB-6C1B-416e-83E4-31A0688EBD3F
+OLDGUID=3D26B463-9543-49F3-954E-C9AA3A76EC3A
 OLDSHORTCUT=Fedora IDM Console.lnk
 OLDPROGRAMFOLDER=Fedora Identity Management Console
 # filename prefix for certain branded jar and script files

More information about the Pkg-fedora-ds-maintainers mailing list