obexftp: updated to 0.20 (from .dev)

5 files changed, 41 insertions, 14 deletions

diff --git a/packages/obexftp/obexftp-0.10.3/.mtn2git_empty b/packages/obexftp/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/obexftp/obexftp-0.10.3/.mtn2git_empty
+++ b/packages/obexftp/files/.mtn2git_empty
diff --git a/packages/obexftp/files/i-hate-libtool.patch b/packages/obexftp/files/i-hate-libtool.patch
new file mode 100644
index 0000000000..1e31ac44b4
--- /dev/null
+++ b/packages/obexftp/files/i-hate-libtool.patch
@@ -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
+ 
diff --git a/packages/obexftp/obexftp-0.10.3/m4.patch b/packages/obexftp/files/m4.patch
index 07c5eedcd7..07c5eedcd7 100644
--- a/packages/obexftp/obexftp-0.10.3/m4.patch
+++ b/packages/obexftp/files/m4.patch
diff --git a/packages/obexftp/obexftp_0.10.3.bb b/packages/obexftp/obexftp_0.10.3.bb
deleted file mode 100644
index c4285c5c9c..0000000000
--- a/packages/obexftp/obexftp_0.10.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "OBEX Ftp Client"
-SECTION = "console/network"
-LICENSE = "GPL"
-PRIORITY = "optional"
-DEPENDS = "openobex libgsm"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
-
-inherit autotools 
-
-#EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo doc'"
-EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo'"
diff --git a/packages/obexftp/obexftp_0.20.bb b/packages/obexftp/obexftp_0.20.bb
new file mode 100644
index 0000000000..23e360bbae
--- /dev/null
+++ b/packages/obexftp/obexftp_0.20.bb
@@ -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
+}
+