[oe-commits] org.oe.oz354x obexftp: updated to 0.20 (from .dev)

[hrw commit]

obexftp: updated to 0.20 (from .dev)

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 84edce46f3f627ff299f88e8e49058460c6f0943
ViewMTN: http://monotone.openembedded.org/revision.psp?id=84edce46f3f627ff299f88e8e49058460c6f0943
Files:
1
packages/obexftp/obexftp-0.10.3
packages/obexftp/obexftp-0.10.3/m4.patch
packages/obexftp/obexftp_0.10.3.bb
packages/obexftp/files
packages/obexftp/files/i-hate-libtool.patch
packages/obexftp/files/m4.patch
packages/obexftp/obexftp_0.20.bb
Diffs:

#
# mt diff -r553d3d3d6e7bf8424c8ad87c0d29b50f52ebe53b -r84edce46f3f627ff299f88e8e49058460c6f0943
#
# 
# 
# delete "packages/obexftp/obexftp-0.10.3"
# 
# delete "packages/obexftp/obexftp-0.10.3/m4.patch"
# 
# delete "packages/obexftp/obexftp_0.10.3.bb"
# 
# add_dir "packages/obexftp/files"
# 
# add_file "packages/obexftp/files/i-hate-libtool.patch"
#  content [433e88e1cfeb02774dfac3e26712eb297ec35690]
# 
# add_file "packages/obexftp/files/m4.patch"
#  content [81514cb752445b878fb8a0a96ad16787aadf004d]
# 
# add_file "packages/obexftp/obexftp_0.20.bb"
#  content [c55f1af56071cfbe2fd0843c1abd7a675d5daae6]
# 
============================================================
--- packages/obexftp/files/i-hate-libtool.patch	433e88e1cfeb02774dfac3e26712eb297ec35690
+++ packages/obexftp/files/i-hate-libtool.patch	433e88e1cfeb02774dfac3e26712eb297ec35690
@@ -0,0 +1,20 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- obexftp-0.20/apps/Makefile.am~i-hate-libtool
++++ obexftp-0.20/apps/Makefile.am
+@@ -9,9 +9,9 @@
+ LDADD =				../obexftp/libobexftp.la \
+ 				../multicobex/libmulticobex.la \
+ 				../bfb/libbfb.la \
+-				@OPENOBEX_LIBS@
+-#				@BLUETOOTH_LIBS@
+-#				@USB_LIBS@
++				@OPENOBEX_LIBS@ \
++				@BLUETOOTH_LIBS@
++#				@USB_LIBS@
+ # need on win32:
+ # getopt.o getopt1.o libopenobex.a libwsock32.a
+ 
============================================================
--- packages/obexftp/files/m4.patch	81514cb752445b878fb8a0a96ad16787aadf004d
+++ packages/obexftp/files/m4.patch	81514cb752445b878fb8a0a96ad16787aadf004d
@@ -0,0 +1,64 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- /dev/null	2003-09-23 18:19:32.000000000 -0400
++++ obexftp-0.10.3/m4/openobex.m4	2004-03-06 05:10:27.000000000 -0500
+@@ -0,0 +1,56 @@
++dnl Check for openobex library
++dnl Written by Pontus Fuchs 2000-08-18
++dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17
++
++AC_DEFUN([AM_PATH_OPENOBEX], [
++	AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
++
++	if test "$OPENOBEX_CONFIG" = "no" ; then
++		AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.)
++	fi
++
++	min_obex_version=ifelse([$1], ,0.9.6,$1)
++	AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
++
++	OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
++	OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
++
++	obex_config_version=`$OPENOBEX_CONFIG --version`
++
++	obex_config_major_version=`$OPENOBEX_CONFIG --version | \
++		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++	obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
++		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++	obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
++		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++
++	obex_req_major_version=`echo $min_obex_version | \
++		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++	obex_req_minor_version=`echo $min_obex_version | \
++		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++	obex_req_micro_version=`echo $min_obex_version | \
++		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++
++
++	if test $obex_req_major_version -lt $obex_config_major_version ; then
++       		obex_config_version_ok="yes"
++       	fi
++	if test $obex_req_major_version -eq $obex_config_major_version ; then
++		if test $obex_req_minor_version -lt $obex_config_minor_version ; then
++       			obex_config_version_ok="yes"
++	       	fi
++		if test $obex_req_minor_version -eq $obex_config_minor_version ; then
++			if test $obex_req_micro_version -le $obex_config_micro_version ; then
++				obex_config_version_ok="yes"
++			fi
++		fi
++	fi
++	
++	if test "$obex_config_version_ok" != "yes" ; then
++		AC_MSG_ERROR(Installed openobex library too old ($obex_config_version))
++	fi
++
++	AC_SUBST(OPENOBEX_CFLAGS)
++	AC_SUBST(OPENOBEX_LIBS)
++	AC_MSG_RESULT(yes)
++])
============================================================
--- packages/obexftp/obexftp_0.20.bb	c55f1af56071cfbe2fd0843c1abd7a675d5daae6
+++ packages/obexftp/obexftp_0.20.bb	c55f1af56071cfbe2fd0843c1abd7a675d5daae6
@@ -0,0 +1,21 @@
+DESCRIPTION = "OBEX Ftp Client based on openobex."
+SECTION = "console/network"
+HOMEPAGE = "http://openobex.triq.net"
+LICENSE = "GPL"
+DEPENDS = "openobex libgsm"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
+           file://i-hate-libtool.patch;patch=1 \
+	   file://m4.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs"
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+	autotools_stage_all
+}
+