[oe-commits] Paul Eggleton : opie-reader: fix SRC_URI and INC_PR

[git version control]

Module: openembedded.git
Branch: master
Commit: 80deab3c97cf17f605e8de615fe3ebd5bd317161
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=80deab3c97cf17f605e8de615fe3ebd5bd317161

Author: Paul Eggleton <bluelightning at bluelightning.org>
Date:   Tue Dec 14 23:47:05 2010 +0000

opie-reader: fix SRC_URI and INC_PR

* SRC_URI has been removed from the inc file and added to 1.2.4 version
* Fixed 1.2.5 version to use INC_PR as other opie-reader files do

Signed-off-by: Paul Eggleton <bluelightning at bluelightning.org>

---

 recipes/opie-reader/opie-reader.inc      |    5 +----
 recipes/opie-reader/opie-reader_1.2.4.bb |    6 +++++-
 recipes/opie-reader/opie-reader_1.2.5.bb |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/recipes/opie-reader/opie-reader.inc b/recipes/opie-reader/opie-reader.inc
index 76bc67c..937fc39 100644
--- a/recipes/opie-reader/opie-reader.inc
+++ b/recipes/opie-reader/opie-reader.inc
@@ -9,11 +9,8 @@ RRECOMMENDS_PN = "opie-reader-filter-htmlfilter, opie-reader-codec-weasel, opie-
   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 = "r4"
+INC_PR = "r5"
 
-SRC_URI = "${OPIE_GIT};protocol=git;tag=${TAG};subpath=noncore/apps/opie-reader \
-           ${OPIE_GIT};protocol=git;tag=${TAG};subpath=pics \
-           ${OPIE_GIT};protocol=git;tag=${TAG};subpath=apps"
 S = "${WORKDIR}/opie-reader"
 
 EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
diff --git a/recipes/opie-reader/opie-reader_1.2.4.bb b/recipes/opie-reader/opie-reader_1.2.4.bb
index d5803c0..8ff6666 100644
--- a/recipes/opie-reader/opie-reader_1.2.4.bb
+++ b/recipes/opie-reader/opie-reader_1.2.4.bb
@@ -1,3 +1,7 @@
 require ${PN}.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+
+SRC_URI = "http://sources.openembedded.org/opie-1.2.4-split_noncore_apps_opie-reader.tar.bz2 \
+           http://sources.openembedded.org/opie-1.2.4-split_pics.tar.bz2 \
+           http://sources.openembedded.org/opie-1.2.4-split_apps.tar.bz2"
diff --git a/recipes/opie-reader/opie-reader_1.2.5.bb b/recipes/opie-reader/opie-reader_1.2.5.bb
index 95f9d77..0e75af8 100644
--- a/recipes/opie-reader/opie-reader_1.2.5.bb
+++ b/recipes/opie-reader/opie-reader_1.2.5.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_noncore_apps_opie-reader.tar.bz2 \
            http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2 \