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

[glen]

Author: glen                         Date: Thu Dec  9 20:15:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- apply install-hook.patch

---- Files affected:
packages/nsis-openvpn:
   nsis-openvpn.spec (1.10 -> 1.11) , openvpn-gui.nsi (1.5 -> 1.6) , install-hook.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

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

================================================================
Index: packages/nsis-openvpn/openvpn-gui.nsi
diff -u packages/nsis-openvpn/openvpn-gui.nsi:1.5 packages/nsis-openvpn/openvpn-gui.nsi:1.6
--- packages/nsis-openvpn/openvpn-gui.nsi:1.5	Thu Dec  9 21:14:54 2010
+++ packages/nsis-openvpn/openvpn-gui.nsi	Thu Dec  9 21:15:31 2010
@@ -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.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/openvpn-gui.nsi?r1=1.5&r2=1.6&f=u