3 files changed, 25 insertions, 38 deletions
diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc
new file mode 100644
index 0000000000..40475cf8c3
--- /dev/null
+++ b/packages/libopieobex/libopieobex0.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "IrDA obex support library"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "LGPL"
+DEPENDS = "opie-taskbar"
+RDEPENDS = "openobex-apps"
+APPNAME = "obex"
+
+S = "${WORKDIR}/obex"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
+}
+
+FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"
diff --git a/packages/libopieobex/libopieobex0_1.2.0.bb b/packages/libopieobex/libopieobex0_1.2.0.bb
index 59f4004c05..a90177b6d5 100644
--- a/packages/libopieobex/libopieobex0_1.2.0.bb
+++ b/packages/libopieobex/libopieobex0_1.2.0.bb
@@ -1,24 +1,7 @@
-DESCRIPTION = "IrDA obex support library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-DEPENDS = "opie-taskbar"
-RDEPENDS = "openobex-apps"
-APPNAME = "obex"
+include libopieobex0.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics      \
 	   file://chdir-patch.patch;patch=1;pnum=0           "
-S = "${WORKDIR}/obex"
-
-inherit opie
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
-}
-
-FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"
diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index c43faf8659..05983a8ee3 100644
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,23 +1,7 @@
-DESCRIPTION = "IrDA obex support library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-DEPENDS = "opie-taskbar"
-RDEPENDS = "openobex-apps"
+include libopieobex0.inc
+
 PV = "1.2.0+cvs-${CVSDATE}"
-APPNAME = "obex"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
            ${HANDHELDS_CVS};module=opie/pics"
-S = "${WORKDIR}/obex"
-
-inherit opie
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
-}
-
-FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"