[Fedora-directory-commits] esc/win32 setup.iss,1.9,1.10

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22544

Modified Files:
    setup.iss 
Log Message:
Get pk11install working. Bug# 497930.

Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- setup.iss	15 Apr 2009 21:47:32 -0000	1.9
+++ setup.iss	29 Apr 2009 20:36:09 -0000	1.10
@@ -111,19 +111,18 @@
 Source: BUILD\ESC\xulrunner\mozctl.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\mozctlx.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\nspr4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libnspr4.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\nss3.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\nssckbi.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\plc4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libplc4.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\plds4.dll; DestDir: {app}\PKCS11
+Source: BUILD\libplds4.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\README.txt; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\smime3.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\softokn3.chk; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\xulrunner
-Source: BUILD\ESC\xulrunner\softokn3.dll; DestDir: {app}\PKCS11
+Source: BUILD\softokn3.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\ssl3.dll; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\updater.exe; DestDir: {app}\xulrunner
 Source: BUILD\ESC\xulrunner\xpcom.dll; DestDir: {app}\xulrunner
@@ -414,9 +413,6 @@
 Source: BUILD\ESC\xulrunner\res\fonts\mathfontSTIXSize1.properties; DestDir: {app}\xulrunner\res\fonts
 Source: BUILD\ESC\xulrunner\res\html\folder.png; DestDir: {app}\xulrunner\res\html
 Source: BUILD\ESC\xulrunner\defaults\profile\localstore.rdf; DestDir: {app}\xulrunner\defaults\profile
-Source: BUILD\ESC\xulrunner\sqlite3.dll; DestDir: {app}\PKCS11
-Source: BUILD\ESC\xulrunner\mozcrt19.dll; DestDir: {app}\PKCS11
-Source: BUILD\ESC\xulrunner\nssutil3.dll; DestDir: {app}\PKCS11
 Source: BUILD\ESC\xulrunner\dictionaries\en-US.aff; DestDir: {app}\dictionaries
 Source: BUILD\ESC\xulrunner\dictionaries\en-US.dic; DestDir: {app}\dictionaries
 Source: BUILD\ESC\xulrunner\modules\XPCOMUtils.jsm; DestDir: {app}\modules