packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/openvpn-gui.nsi, nsi...

[glen]

Author: glen                         Date: Thu Dec  9 20:14:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- apply options-override.patch 

---- Files affected:
packages/nsis-openvpn:
   nsis-openvpn.spec (1.9 -> 1.10) , openvpn-gui.nsi (1.3 -> 1.4) , options-override.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.9 packages/nsis-openvpn/nsis-openvpn.spec:1.10
--- packages/nsis-openvpn/nsis-openvpn.spec:1.9	Thu Dec  9 21:13:00 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec	Thu Dec  9 21:14:05 2010
@@ -11,7 +11,6 @@
 # NoSource0-md5:	64fce7dc20fdd991ffdee2cfce9dfb0b
 NoSource:	0
 Source1:	openvpn-gui.nsi
-Patch2:		options-override.patch
 Patch3:		defaults.patch
 Patch4:		install-hook.patch
 BuildRequires:	rpmbuild(macros) >= 1.553
@@ -29,7 +28,6 @@
 %prep
 %setup -qc
 cp -a %{SOURCE1} openvpn-gui.nsi
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -56,6 +54,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/12/09 20:14:05  glen
+- apply options-override.patch
+
 Revision 1.9  2010/12/09 20:13:00  glen
 - apply skip-components.patch
 

================================================================
Index: packages/nsis-openvpn/openvpn-gui.nsi
diff -u packages/nsis-openvpn/openvpn-gui.nsi:1.3 packages/nsis-openvpn/openvpn-gui.nsi:1.4
--- packages/nsis-openvpn/openvpn-gui.nsi:1.3	Thu Dec  9 21:13:00 2010
+++ packages/nsis-openvpn/openvpn-gui.nsi	Thu Dec  9 21:14:05 2010
@@ -98,10 +98,18 @@
   !define MUI_FINISHPAGE_NOAUTOCLOSE
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
   !define MUI_ABORTWARNING
+!ifndef ICON
   !define MUI_ICON "${HOME}\install-win32\openvpn.ico"
-  !define MUI_UNICON "${HOME}\install-win32\openvpn.ico"
+!else
+  !define MUI_ICON "${ICON}"
+!endif
+  !define MUI_UNICON "${MUI_ICON}"
   !define MUI_HEADERIMAGE
+!ifndef HEADERIMAGE_BITMAP
   !define MUI_HEADERIMAGE_BITMAP "${HOME}\install-win32\install-whirl.bmp"
+!else
+  !define MUI_HEADERIMAGE_BITMAP ${HEADERIMAGE_BITMAP}
+!endif
   !define MUI_UNFINISHPAGE_NOAUTOCLOSE
 
   !define MUI_WELCOMEPAGE_TITLE "Welcome to the ${PRODUCT_NAME} Setup Wizard"
@@ -176,8 +184,8 @@
   
   ;Things that need to be extracted on first (keep these lines before any File command!)
   ;Only useful for BZIP2 compression
-  
-  ReserveFile "${HOME}\install-win32\install-whirl.bmp"
+
+  ReserveFile "${MUI_HEADERIMAGE_BITMAP}"
 
 ;--------------------------------
 ;Macros
@@ -625,7 +633,7 @@
   SetOutPath $INSTDIR
   File "${HOME}\install-win32\INSTALL-win32.txt"
   File "${HOME}\install-win32\license.txt"
-  File "${HOME}\install-win32\openvpn.ico"
+  File "/oname=openvpn.ico" "${MUI_ICON}"
 
   ; Create file association if requested
   SectionGetFlags ${SecFileAssociation} $R0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/nsis-openvpn.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/openvpn-gui.nsi?r1=1.3&r2=1.4&f=u