packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/skip-components.patc...

[glen]

Author: glen                         Date: Fri Dec  3 15:00:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow skipping some components

---- Files affected:
packages/nsis-openvpn:
   nsis-openvpn.spec (1.2 -> 1.3) , skip-components.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.2 packages/nsis-openvpn/nsis-openvpn.spec:1.3
--- packages/nsis-openvpn/nsis-openvpn.spec:1.2	Fri Dec  3 12:25:28 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec	Fri Dec  3 16:00:33 2010
@@ -2,7 +2,7 @@
 Summary:	NSIS OpenVPN installer builder
 Name:		nsis-openvpn
 Version:	2.0.9
-Release:	0.1
+Release:	0.3
 # OpenVPN windows executable is GPL, no ideas about the rest
 License:	GPL
 Group:		Development/Tools
@@ -11,6 +11,7 @@
 # NoSource0-md5:	64fce7dc20fdd991ffdee2cfce9dfb0b
 NoSource:	0
 Patch0:		nsis-constants.patch
+Patch1:		skip-components.patch
 BuildRequires:	rpmbuild(macros) >= 1.553
 BuildRequires:	unix2dos
 Requires:	nsis >= 2.34
@@ -27,6 +28,7 @@
 %setup -qc
 %undos openvpn-gui.nsi
 %patch0 -p1
+%patch1 -p1
 
 %build
 unix2dos openvpn-gui.nsi
@@ -51,6 +53,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/12/03 15:00:33  glen
+- allow skipping some components
+
 Revision 1.2  2010/12/03 11:25:28  glen
 - make work with current nsis
 

================================================================
Index: packages/nsis-openvpn/skip-components.patch
diff -u /dev/null packages/nsis-openvpn/skip-components.patch:1.1
--- /dev/null	Fri Dec  3 16:00:38 2010
+++ packages/nsis-openvpn/skip-components.patch	Fri Dec  3 16:00:33 2010
@@ -0,0 +1,42 @@
+--- OpenVPN/openvpn-gui.nsi	2010-12-03 13:36:41.000000000 +0200
++++ nsis-openvpn-2.0.9/openvpn-gui.nsi	2010-12-03 16:58:10.857685865 +0200
+@@ -231,6 +231,7 @@
+ 
+ SectionEnd
+ 
++!ifndef SKIP_EASYRSA
+ Section "OpenVPN RSA Certificate Management Scripts" SecOpenVPNEasyRSA
+ 
+   SetOverwrite on
+@@ -253,6 +254,7 @@
+   File "${HOME}\easy-rsa\serial.start"
+ 
+ SectionEnd
++!endif
+ 
+ Section "OpenVPN GUI" SecGUI
+ 
+@@ -280,6 +282,7 @@
+ Section "AutoStart OpenVPN GUI" SecGUIAuto
+ SectionEnd
+ 
++!ifndef SKIP_MYCERT
+ Section "My Certificate Wizard" SecMYCERT
+ 
+   SetOverwrite on
+@@ -288,6 +291,7 @@
+   File "${HOME}\mycertwizard\mycert.ini"
+ 
+ SectionEnd
++!endif
+ 
+ Section "Hide the TAP-Win32 Virtual Ethernet Adapter" SecTAPHidden
+ SectionEnd
+@@ -324,6 +328,7 @@
+ Section "OpenVPN File Associations" SecFileAssociation
+ SectionEnd
+ 
++!ifndef SKIP_OPENSSL
+ Section "OpenSSL DLLs" SecOpenSSLDLLs
+ 
+   SetOverwrite on
================================================================

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