opie-reader: fix RRECOMMENDS, RSUGGESTS and introduce INC_PR. Closes #2695.

5 files changed, 10 insertions, 16 deletions

diff --git a/recipes/opie-reader/opie-reader.inc b/recipes/opie-reader/opie-reader.inc
index 02408adbf2..2a78c9c6d7 100644
--- a/recipes/opie-reader/opie-reader.inc
+++ b/recipes/opie-reader/opie-reader.inc
@@ -4,6 +4,12 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "opie-reader"
 APPTYPE = "binary"
+DEPENDS = "flite"
+RRECOMMENDS_PN = "opie-reader-filter-htmlfilter, opie-reader-codec-weasel, opie-reader-codec-reb, \
+  opie-reader-codec-isilo, opie-reader-codec-aportis, opie-reader-codec-ppms, opie-reader-codec-chm, \
+  opie-reader-codec-plucker, opie-reader-codec-arrierego"
+RSUGGESTS_PN = "opie-reader-output-flitedyn16, opie-reader-output-flitecmd, opie-reader-output-flitedyn"
+INC_PR = "r2"
 
 S = "${WORKDIR}/opie-reader"
 
@@ -12,7 +18,6 @@ PARALLEL_MAKE = ""
 
 inherit opie
 
-DEPENDS += " flite "
 EXTRA_QMAKEVARS_POST += " SUBDIRS+=FliteDyn SUBDIRS+=FliteDyn16 INCLUDEPATH+=${STAGING_INCDIR}/flite"
 
 do_install() {
@@ -56,16 +61,4 @@ python populate_packages_prepend () {
                               'Opie reader %s ' + type,
                               prepend=True)
 
-        # input codes are small and should be installed together with opie-reader,
-        # flite output pulls in libflite and thus should only be installed if
-        # really wanted by the user
-        suggests=[]
-        recommends=[]
-        for package in bb.data.getVar('PACKAGES', d).split():
-            if 'flite' in package:
-                suggests.append(package)
-            else:
-                recommends.append(package)
-        bb.data.setVar('RRECOMMENDS_opie-reader', " ".join( recommends ), d)
-        bb.data.setVar('RSUGGESTS_opie-reader', " ".join( suggests ), d)
 }
diff --git a/recipes/opie-reader/opie-reader_1.2.2.bb b/recipes/opie-reader/opie-reader_1.2.2.bb
index 6568b79ee9..ba0de6d246 100644
--- a/recipes/opie-reader/opie-reader_1.2.2.bb
+++ b/recipes/opie-reader/opie-reader_1.2.2.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
+PR = "${INC_PR}.0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/recipes/opie-reader/opie-reader_1.2.3.bb b/recipes/opie-reader/opie-reader_1.2.3.bb
index 43632416c5..eff44c27e4 100644
--- a/recipes/opie-reader/opie-reader_1.2.3.bb
+++ b/recipes/opie-reader/opie-reader_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = r2
+PR = "${INC_PR}.0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/recipes/opie-reader/opie-reader_1.2.4.bb b/recipes/opie-reader/opie-reader_1.2.4.bb
index 43632416c5..eff44c27e4 100644
--- a/recipes/opie-reader/opie-reader_1.2.4.bb
+++ b/recipes/opie-reader/opie-reader_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = r2
+PR = "${INC_PR}.0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/recipes/opie-reader/opie-reader_cvs.bb b/recipes/opie-reader/opie-reader_cvs.bb
index 36c8c06157..1eda49f6ef 100644
--- a/recipes/opie-reader/opie-reader_cvs.bb
+++ b/recipes/opie-reader/opie-reader_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = r2
+PR = "${INC_PR}.0"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};module=opie/pics \