packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/options-override.pat...

[glen]

Author: glen                         Date: Fri Dec  3 15:48:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow override options from cmdline, icons for now

---- Files affected:
packages/nsis-openvpn:
   nsis-openvpn.spec (1.3 -> 1.4) , options-override.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.3 packages/nsis-openvpn/nsis-openvpn.spec:1.4
--- packages/nsis-openvpn/nsis-openvpn.spec:1.3	Fri Dec  3 16:00:33 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec	Fri Dec  3 16:48:11 2010
@@ -2,7 +2,7 @@
 Summary:	NSIS OpenVPN installer builder
 Name:		nsis-openvpn
 Version:	2.0.9
-Release:	0.3
+Release:	0.7
 # OpenVPN windows executable is GPL, no ideas about the rest
 License:	GPL
 Group:		Development/Tools
@@ -12,6 +12,7 @@
 NoSource:	0
 Patch0:		nsis-constants.patch
 Patch1:		skip-components.patch
+Patch2:		options-override.patch
 BuildRequires:	rpmbuild(macros) >= 1.553
 BuildRequires:	unix2dos
 Requires:	nsis >= 2.34
@@ -29,6 +30,7 @@
 %undos openvpn-gui.nsi
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 unix2dos openvpn-gui.nsi
@@ -53,6 +55,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/12/03 15:48:11  glen
+- allow override options from cmdline, icons for now
+
 Revision 1.3  2010/12/03 15:00:33  glen
 - allow skipping some components
 

================================================================
Index: packages/nsis-openvpn/options-override.patch
diff -u /dev/null packages/nsis-openvpn/options-override.patch:1.1
--- /dev/null	Fri Dec  3 16:48:16 2010
+++ packages/nsis-openvpn/options-override.patch	Fri Dec  3 16:48:11 2010
@@ -0,0 +1,42 @@
+--- OpenVPN/openvpn-gui.nsi	2010-12-03 17:31:12.000000000 +0200
++++ nsis-openvpn-2.0.9/openvpn-gui.nsi	2010-12-03 17:45:58.538023345 +0200
+@@ -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"
+@@ -174,8 +182,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
+@@ -621,7 +629,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.3&r2=1.4&f=u