[Fedora-directory-commits] adminserver/admserv/newinst/insadm insadm.c, 1.6, 1.7

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/newinst/insadm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25111/adminserver/admserv/newinst/insadm

Modified Files:
	insadm.c 
Log Message:
Change admin server version to 1.0.2
Added adminserver-httpd-moduleorder.patch for use when upgrading to make sure
mod_admserv is loaded after mod_nss



Index: insadm.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/insadm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- insadm.c	28 Oct 2005 22:44:12 -0000	1.6
+++ insadm.c	23 Feb 2006 01:12:45 -0000	1.7
@@ -965,10 +965,10 @@
     else if (strcmp(f, "jss3.jar") == 0) { 
          return 1;
     }
-    else if (strstr(f, "mcc10") == f) { 
+    else if (strstr(f, "fedora-mcc-1.0") == f) { 
          return 1;
     }
-    else if (strstr(f, "nmclf10") == f) { 
+    else if (strstr(f, "fedora-nmclf-1.0") == f) { 
          return 1;
     }
     return 0;
@@ -1082,7 +1082,7 @@
       FindClose(hFile);
    }
    
-   if (cd.nReplaceVersion == 10) /* The current version;
+   if (cd.nReplaceVersion == 1.0) /* The current version;
                                     target of brandAdminServer */
    {
       LoadString(mi.m_hModule, IDS_README, szTemp, sizeof(szTemp));
@@ -1510,7 +1510,7 @@
   // Create the program manager group icons
   //
 
-   if (cd.nReplaceVersion == 10) /* The current version;
+   if (cd.nReplaceVersion == 1.0) /* The current version;
                                     target of brandAdminServer */
    {
       //delete 1.0 readme (current)