rdesktop: use INC_PR in recipes

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/recipes/rdesktop/rdesktop.inc b/recipes/rdesktop/rdesktop.inc
index 4c832cae3fd1e968d01e3d0867f09aa1a68fe509..8f2d587b539e8d45a2ecbd3bd21ccc3cab510b35 100644 (file)
--- a/recipes/rdesktop/rdesktop.inc
+++ b/recipes/rdesktop/rdesktop.inc
@@ -4,4 +4,6 @@ DEPENDS = "virtual/libx11 openssl"
 SECTION = "x11/network"
 LICENSE = "GPL"
 
+INC_PR = "r2"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"

diff --git a/recipes/rdesktop/rdesktop_1.3.1.bb b/recipes/rdesktop/rdesktop_1.3.1.bb
index d50a0c1e8c1ccc1a702deb3fd5dffab65ba3188e..ffb36d22a535e2e23ca51a2f4932a7e2602b6f01 100644 (file)
--- a/recipes/rdesktop/rdesktop_1.3.1.bb
+++ b/recipes/rdesktop/rdesktop_1.3.1.bb
@@ -1,5 +1,7 @@
 require rdesktop.inc
 
+PR = "${INC_PR}.1"
+
 SRC_URI +="file://configure.patch;patch=1"
 
 # Note - rdesktop 1.3.1 doesn't use autotools - don't make the same

diff --git a/recipes/rdesktop/rdesktop_1.4.1.bb b/recipes/rdesktop/rdesktop_1.4.1.bb
index 8682c8ee98217e2307b04e39a37601e804170d24..99200c6f1034b3dfaa5a7fcec8777875fb430114 100644 (file)
--- a/recipes/rdesktop/rdesktop_1.4.1.bb
+++ b/recipes/rdesktop/rdesktop_1.4.1.bb
@@ -1,6 +1,6 @@
 require rdesktop.inc
 
-PR = "r1"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://strip.patch;patch=1"
 

diff --git a/recipes/rdesktop/rdesktop_1.5.0.bb b/recipes/rdesktop/rdesktop_1.5.0.bb
index d652dfe6339a1c2dab52b04a10217d69db02d991..c492afa0b2d5b80b674218f8f90f3c90ad3aa6a9 100644 (file)
--- a/recipes/rdesktop/rdesktop_1.5.0.bb
+++ b/recipes/rdesktop/rdesktop_1.5.0.bb
@@ -1,6 +1,6 @@
 require rdesktop.inc
 
-PR = "r0"
+PR = "${INC_PR}.1"
 
 inherit autotools
 

diff --git a/recipes/rdesktop/rdesktop_1.6.0.bb b/recipes/rdesktop/rdesktop_1.6.0.bb
index d652dfe6339a1c2dab52b04a10217d69db02d991..c492afa0b2d5b80b674218f8f90f3c90ad3aa6a9 100644 (file)
--- a/recipes/rdesktop/rdesktop_1.6.0.bb
+++ b/recipes/rdesktop/rdesktop_1.6.0.bb
@@ -1,6 +1,6 @@
 require rdesktop.inc
 
-PR = "r0"
+PR = "${INC_PR}.1"
 
 inherit autotools
 

diff --git a/recipes/rdesktop/rdesktop_cvs.bb b/recipes/rdesktop/rdesktop_cvs.bb
index 0b76ee75356ff07887a771c979da495ac8928651..496b6defa8e3a11d4b61bebb0e2e302fc147689f 100644 (file)
--- a/recipes/rdesktop/rdesktop_cvs.bb
+++ b/recipes/rdesktop/rdesktop_cvs.bb
@@ -1,7 +1,7 @@
 require rdesktop.inc
 
 PV = "1.6.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "${INC_PR}.1"
 DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://anonymous@rdesktop.cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop"
 S = "${WORKDIR}/rdesktop"
@@ -9,4 +9,3 @@ S = "${WORKDIR}/rdesktop"
 inherit autotools
 
 EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
-