packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/nsis-constants.patch...

glen glen at pld-linux.org
Fri Dec 3 12:25:33 CET 2010


Author: glen                         Date: Fri Dec  3 11:25:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make work with current nsis

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

---- Diffs:

================================================================
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.1 packages/nsis-openvpn/nsis-openvpn.spec:1.2
--- packages/nsis-openvpn/nsis-openvpn.spec:1.1	Fri Dec  3 12:16:21 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec	Fri Dec  3 12:25:28 2010
@@ -7,10 +7,13 @@
 License:	GPL
 Group:		Development/Tools
 URL:		http://openvpn.se/files/howto/openvpn-howto_roll_your_own_installation_package.html
-Source0:	http://www.openvpn.se/files/install_packages_source/openvpn_install_source-2.0.9-gui-1.0.3.zip
+Source0:	http://www.openvpn.se/files/install_packages_source/openvpn_install_source-%{version}-gui-1.0.3.zip
 # NoSource0-md5:	64fce7dc20fdd991ffdee2cfce9dfb0b
 NoSource:	0
-Requires:	nsis
+Patch0:		nsis-constants.patch
+BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	unix2dos
+Requires:	nsis >= 2.34
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -22,6 +25,11 @@
 
 %prep
 %setup -qc
+%undos openvpn-gui.nsi
+%patch0 -p1
+
+%build
+unix2dos openvpn-gui.nsi
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,5 +51,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/12/03 11:25:28  glen
+- make work with current nsis
+
 Revision 1.1  2010/12/03 11:16:21  glen
 - initial, just original source for now

================================================================
Index: packages/nsis-openvpn/nsis-constants.patch
diff -u /dev/null packages/nsis-openvpn/nsis-constants.patch:1.1
--- /dev/null	Fri Dec  3 12:25:33 2010
+++ packages/nsis-openvpn/nsis-constants.patch	Fri Dec  3 12:25:28 2010
@@ -0,0 +1,13 @@
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi~	2010-12-03 13:22:23.000000000 +0200
++++ nsis-openvpn-2.0.9/openvpn-gui.nsi	2010-12-03 13:22:26.279396336 +0200
+@@ -218,8 +218,8 @@
+ ;--------------------------------
+ ;Installer Sections
+ 
+-!define SF_SELECTED   1
+-!define SF_RO         16
++;!define SF_SELECTED   1
++;!define SF_RO         16
+ !define SF_NOT_RO     0xFFFFFFEF
+ 
+ Section "OpenVPN User-Space Components" SecOpenVPNUserSpace
================================================================

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



More information about the pld-cvs-commit mailing list