rdesktop: unify, update lock down cvs${SRCDATE}

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index e8783abb4dfc94b5b6650ca4b2957b003a8d9866..f1e1ca110dec09eea8dd64c47baede871d21dc66 100644 (file)
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -83,6 +83,7 @@ SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
 SRCDATE_qemu-native ?= "20070613"
+SRCDATE_rdesktop ?= "20080917"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"

diff --git a/packages/rdesktop/rdesktop.inc b/packages/rdesktop/rdesktop.inc
new file mode 100644 (file)
index 0000000..4c832ca
--- /dev/null
+++ b/packages/rdesktop/rdesktop.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+HOMEPAGE = "http://www.rdesktop.org"
+DEPENDS = "virtual/libx11 openssl"
+SECTION = "x11/network"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"

diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb
index f54c675314807dded6a1c6810af873b6a97607df..d50a0c1e8c1ccc1a702deb3fd5dffab65ba3188e 100644 (file)
--- a/packages/rdesktop/rdesktop_1.3.1.bb
+++ b/packages/rdesktop/rdesktop_1.3.1.bb
@@ -1,16 +1,6 @@
-# rdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
+require rdesktop.inc
 
-DESCRIPTION = "RDesktop is a X11 based RDP client"
-HOMEPAGE = "http://www.rdesktop.org/"
-LICENSE = "GPL"
-DEPENDS = "virtual/libx11 openssl"
-RDEPENDS= "openssl"
-SECTION = "x11/network"
-
-SRC_URI="${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \
-       file://configure.patch;patch=1"
+SRC_URI +="file://configure.patch;patch=1"
 
 # Note - rdesktop 1.3.1 doesn't use autotools - don't make the same
 # mistakes I did.. :)

diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
index da1794b1903ce9bfa150deb73bd87f7c21b27da5..8682c8ee98217e2307b04e39a37601e804170d24 100644 (file)
--- a/packages/rdesktop/rdesktop_1.4.1.bb
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "virtual/libx11 openssl"
-HOMEPAGE = "http://www.rdesktop.org"
-SECTION = "x11/network"
-LICENSE = "GPL"
-PV = "1.4.1"
+require rdesktop.inc
+
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \
-       file://strip.patch;patch=1"
+SRC_URI += "file://strip.patch;patch=1"
 
 inherit autotools
 

diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb
index 12385c127fa26fbd0c65e12bf661ab6d4c43c3aa..d652dfe6339a1c2dab52b04a10217d69db02d991 100644 (file)
--- a/packages/rdesktop/rdesktop_1.5.0.bb
+++ b/packages/rdesktop/rdesktop_1.5.0.bb
@@ -1,12 +1,6 @@
-DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "virtual/libx11 openssl"
-HOMEPAGE = "http://www.rdesktop.org"
-SECTION = "x11/network"
-LICENSE = "GPL"
-PV = "1.5.0"
-PR = "r0"
+require rdesktop.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
+PR = "r0"
 
 inherit autotools
 

diff --git a/packages/rdesktop/rdesktop_1.6.0.bb b/packages/rdesktop/rdesktop_1.6.0.bb
index b5337f9e8317d9946efa27eaa09236209163f1b0..d652dfe6339a1c2dab52b04a10217d69db02d991 100644 (file)
--- a/packages/rdesktop/rdesktop_1.6.0.bb
+++ b/packages/rdesktop/rdesktop_1.6.0.bb
@@ -1,12 +1,6 @@
-DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "virtual/libx11 openssl"
-HOMEPAGE = "http://www.rdesktop.org"
-SECTION = "x11/network"
-LICENSE = "GPL"
-PV = "1.6.0"
-PR = "r0"
+require rdesktop.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
+PR = "r0"
 
 inherit autotools
 

diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb
index 63d082be0c070bfcc601cbee42f2b60d1f001f3b..0b76ee75356ff07887a771c979da495ac8928651 100644 (file)
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -1,10 +1,7 @@
-DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "virtual/libx11 openssl"
-HOMEPAGE = "http://www.rdesktop.org"
-SECTION = "x11/network"
-LICENSE = "GPL"
-PV = "1.5.0+cvs${SRCDATE}"
-PR = "r3"
+require rdesktop.inc
+
+PV = "1.6.0+cvs${SRCDATE}"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://anonymous@rdesktop.cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop"
 S = "${WORKDIR}/rdesktop"