summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-09-18 08:08:13 +0000
committerKoen Kooi <koen@openembedded.org>2008-09-18 08:08:13 +0000
commit4726077de2e910260443e159384f2eede3f10310 (patch)
tree92a3cbca7dcefadc010e083750b203154aeb55fe /packages
parentf5ddbcbe60b8aada0596de1d0662fe6f76113b57 (diff)
parent424fe3f5e3fe243cb6dca1927e4a036a726d7c46 (diff)
merge of '20460ca5bc208d9dfe0693cc79f9684c01aef89d'
and '47719692fbdea0a9908a2b8c86858fe92ce97e1e'
Diffstat (limited to 'packages')
-rw-r--r--packages/rdesktop/rdesktop.inc7
-rw-r--r--packages/rdesktop/rdesktop_1.3.1.bb14
-rw-r--r--packages/rdesktop/rdesktop_1.4.1.bb11
-rw-r--r--packages/rdesktop/rdesktop_1.5.0.bb10
-rw-r--r--packages/rdesktop/rdesktop_1.6.0.bb10
-rw-r--r--packages/rdesktop/rdesktop_cvs.bb11
6 files changed, 20 insertions, 43 deletions
diff --git a/packages/rdesktop/rdesktop.inc b/packages/rdesktop/rdesktop.inc
new file mode 100644
index 0000000000..4c832cae3f
--- /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 f54c675314..d50a0c1e8c 100644
--- 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 da1794b190..8682c8ee98 100644
--- 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 12385c127f..d652dfe633 100644
--- 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 b5337f9e83..d652dfe633 100644
--- 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 63d082be0c..0b76ee7535 100644
--- 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"