OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 12-May-2009 22:16:18
Branch: HEAD Handle: 2009051221161800
Added files:
openpkg-src/cloudvpn cloudvpn.patch
Modified files:
openpkg-src/cloudvpn cloudvpn.spec
Log:
upgrading package: cloudvpn 1.99.2 -> 1.99.3
Summary:
Revision Changes Path
1.3 +20 -0 openpkg-src/cloudvpn/cloudvpn.patch
1.6 +16 -11 openpkg-src/cloudvpn/cloudvpn.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cloudvpn/cloudvpn.patch
============================================================================
$ cvs diff -u -r0 -r1.3 cloudvpn.patch
--- /dev/null 2009-05-12 22:16:18 +0200
+++ cloudvpn.patch 2009-05-12 22:16:18 +0200
@@ -0,0 +1,20 @@
+Index: autogen.sh
+--- autogen.sh.orig 2009-05-12 14:58:12 +0200
++++ autogen.sh 2009-05-12 22:00:51 +0200
+@@ -9,13 +9,13 @@
+ echo "bin_PROGRAMS = ${PROGS}" >>$OUT
+ echo "noinst_LIBRARIES = libcommon.a" >>$OUT
+ echo "libcommon_a_SOURCES = $COMMON" >>$OUT
+-echo "libcommon_a_CPPFLAGS = -Iinclude/" >>$OUT
++echo "libcommon_a_CPPFLAGS = @CPPFLAGS@ -Iinclude/" >>$OUT
+
+ for i in $PROGS ; do
+ SOURCES=`echo src/$i/*.cpp`
+ echo "${i}_SOURCES = $SOURCES" >>$OUT
+- echo "${i}_CPPFLAGS = -Isrc/$i/ -Iinclude/" >>$OUT
+- echo "${i}_LDADD = libcommon.a" >>$OUT
++ echo "${i}_CPPFLAGS = @CPPFLAGS@ -Isrc/$i/ -Iinclude/" >>$OUT
++ echo "${i}_LDADD = @LDFLAGS@ libcommon.a" >>$OUT
+ [ -f src/$i/Makefile.am.extra ] &&
+ while read l ; do
+ [ "$l" ] && echo "${i}_${l}" >>$OUT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cloudvpn/cloudvpn.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 cloudvpn.spec
--- openpkg-src/cloudvpn/cloudvpn.spec 10 May 2009 09:33:29 -0000
1.5
+++ openpkg-src/cloudvpn/cloudvpn.spec 12 May 2009 20:16:18 -0000
1.6
@@ -34,16 +34,17 @@
Class: EVAL
Group: Networking
License: GPL
-Version: 1.99.2
-Release: 20090510
+Version: 1.99.3
+Release: 20090512
# list of sources
Source0: http://www.e-x-a.org/releases/cloudvpn-%{version}.tar.bz2
+Patch0: cloudvpn.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, cmake
+BuildPreReq: OpenPKG, openpkg >= 20060823, automake, autoconf
PreReq: OpenPKG, openpkg >= 20060823
BuildPreReq: gcrypt, gnutls
PreReq: gcrypt, gnutls
@@ -64,15 +65,19 @@
%prep
%setup -q
+ %patch -p0
%build
- export CC="%{l_cc}"
- export CXX="%{l_cxx}"
- export CFLAGS="%{l_cflags -O} %{l_cppflags}"
- export CXXFLAGS="%{l_cxxflags -O} %{l_cppflags}"
- export LDFLAGS="%{l_ldflags}"
- export EXTRA_LIBS="-lgnutls -lgcrypt -ltasn1 -lgpg-error -lz"
- cmake .
+ ./autogen.sh
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags}" \
+ CXXFLAGS="%{l_cxxflags -O} %{l_cppflags}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ LIBS="-lgnutls -lgcrypt -ltasn1 -lgpg-error -lz" \
+ ./configure \
+ --prefix=%{l_prefix}
%{l_make} %{l_mflags}
%install
@@ -80,7 +85,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin
%{l_shtool} install -c -s -m 755 \
- cloud eth-unix stunproxy \
+ cloud eth_unix stunproxy \
$RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
