packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/install-hook.patch (...

[glen]

Author: glen                         Date: Fri Dec  3 17:14:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- -DEXTRA_INSTALL_NSI=install.nsi support

---- Files affected:
packages/nsis-openvpn:
   nsis-openvpn.spec (1.5 -> 1.6) , install-hook.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.5 packages/nsis-openvpn/nsis-openvpn.spec:1.6
--- packages/nsis-openvpn/nsis-openvpn.spec:1.5	Fri Dec  3 18:06:39 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec	Fri Dec  3 18:14:49 2010
@@ -2,7 +2,7 @@
 Summary:	NSIS OpenVPN installer builder
 Name:		nsis-openvpn
 Version:	2.0.9
-Release:	0.15
+Release:	0.16
 # OpenVPN windows executable is GPL, no ideas about the rest
 License:	GPL
 Group:		Development/Tools
@@ -14,6 +14,7 @@
 Patch1:		skip-components.patch
 Patch2:		options-override.patch
 Patch3:		defaults.patch
+Patch4:		install-hook.patch
 BuildRequires:	rpmbuild(macros) >= 1.553
 BuildRequires:	unix2dos
 Requires:	nsis >= 2.34
@@ -33,6 +34,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 unix2dos openvpn-gui.nsi
@@ -57,6 +59,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/12/03 17:14:49  glen
+- -DEXTRA_INSTALL_NSI=install.nsi support
+
 Revision 1.5  2010/12/03 17:06:39  glen
 - change a bit defaults
 

================================================================
Index: packages/nsis-openvpn/install-hook.patch
diff -u /dev/null packages/nsis-openvpn/install-hook.patch:1.1
--- /dev/null	Fri Dec  3 18:14:54 2010
+++ packages/nsis-openvpn/install-hook.patch	Fri Dec  3 18:14:49 2010
@@ -0,0 +1,14 @@
+--- OpenVPN/openvpn-gui.nsi	2010-12-03 18:38:41.000000000 +0200
++++ nsis-openvpn-2.0.9/openvpn-gui.nsi	2010-12-03 19:12:55.920210179 +0200
+@@ -291,6 +291,11 @@
+   File "${HOME}\sample-config\server.${SERV_CONFIG_EXT}"
+ !endif
+ 
++; Extra install hooks included here
++!ifdef EXTRA_INSTALL_NSI
++  !include EXTRA_INSTALL_NSI
++!endif
++
+   SetOutPath "$INSTDIR"
+   File "${HOME}\install-win32\OpenVPN GUI ReadMe.txt"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/nsis-openvpn.spec?r1=1.5&r2=1.6&f=u