From 2f3ca937d66ce6b9f2bdb1c09fbf066818ac92f4 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Apr 2008 11:42:52 +0000 Subject: matchbox-theme-sato: unify recipes git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4172 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb | 9 ++------- meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc | 8 ++++++++ meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb | 10 +--------- meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb | 10 ++-------- 4 files changed, 13 insertions(+), 24 deletions(-) create mode 100644 meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb b/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb index 74bcef14ca..30b632934e 100644 --- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb +++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb @@ -1,14 +1,9 @@ -DESCRIPTION = "Matchbox window manager 2 Sato themes" -LICENSE = "CC-BY-SA3" +require matchbox-theme-sato.inc + DEPENDS = "matchbox-wm-2" -SECTION = "x11/wm" PV = "0.1+svnr${SRCREV}" SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http" S = "${WORKDIR}/matchbox-sato" -inherit autotools pkgconfig - EXTRA_OECONF = "--disable-matchbox-1 --enable-matchbox-2" - -FILES_${PN} += "${datadir}/themes" diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc b/meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc new file mode 100644 index 0000000000..a20596e6db --- /dev/null +++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "Matchbox window manager Sato themes" +LICENSE = "CC-BY-SA3" +DEPENDS = "matchbox-wm" +SECTION = "x11/wm" + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}/themes" diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb index eb903a19c5..f2e2ffd4e4 100644 --- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb +++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb @@ -1,11 +1,3 @@ -DESCRIPTION = "Matchbox window manager Sato themes" -LICENSE = "CC-BY-SA3" -DEPENDS = "matchbox-wm" -SECTION = "x11/wm" +require matchbox-theme-sato.inc SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz" - -inherit autotools pkgconfig - -FILES_${PN} += "${datadir}/themes" - diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb index d42f6421ed..2641edca65 100644 --- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb +++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb @@ -1,12 +1,6 @@ -DESCRIPTION = "Matchbox window manager Sato themes" -LICENSE = "CC-BY-SA3" -DEPENDS = "matchbox-wm" -SECTION = "x11/wm" +require matchbox-theme-sato.inc + PV = "0.1+svnr${SRCREV}" SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http" S = "${WORKDIR}/matchbox-sato" - -inherit autotools pkgconfig - -FILES_${PN} += "${datadir}/themes" -- cgit v1.2.3