libgpewidget: sanitize metadata order a bit and add RRECOMMENDS on gpe-icons

4 files changed, 28 insertions, 24 deletions

diff --git a/packages/libgpewidget/libgpewidget-hildon_0.102.bb b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
index 854d0ea6da..a7d663985e 100644
--- a/packages/libgpewidget/libgpewidget-hildon_0.102.bb
+++ b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
@@ -4,17 +4,14 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ libxrender gtk-doc intltool-native sdk-default-icons"
-RDEPENDS    = "sdk-default-icons"
 PROVIDES    = "libgpewidget"
-RPROVIDES   = "libgpewidget"
-
-SRC_URI     = "${GPE_MIRROR}/libgpewidget-${PV}.tar.bz2"
-
-S = "${WORKDIR}/libgpewidget-${PV}"
 
 DEFAULT_PREFERENCE = "-1"
 
-inherit pkgconfig autotools
+inherit autotools pkgconfig
+
+SRC_URI     = "${GPE_MIRROR}/libgpewidget-${PV}.tar.bz2"
+S = "${WORKDIR}/libgpewidget-${PV}"
 
 EXTRA_OECONF = "--enable-hildon"
 
@@ -23,3 +20,5 @@ do_stage () {
 	autotools_stage_includes
 }
 
+RDEPENDS = "sdk-default-icons"
+RPROVIDES = "libgpewidget"
diff --git a/packages/libgpewidget/libgpewidget_0.114.bb b/packages/libgpewidget/libgpewidget_0.114.bb
index d79beeb417..39a85c52e6 100644
--- a/packages/libgpewidget/libgpewidget_0.114.bb
+++ b/packages/libgpewidget/libgpewidget_0.114.bb
@@ -1,18 +1,16 @@
-LICENSE     = "LGPL"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION = "gpe/libs"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-PR          = "r1"
+LICENSE = "LGPL"
+PRIORITY = "optional"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
+
 inherit gpe pkgconfig autotools
 
 SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
 
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}/*"
-
 EXTRA_OECONF = "--enable-cairo"
 
 LDFLAGS += " -L${STAGING_LIBDIR}"
@@ -20,3 +18,7 @@ LDFLAGS += " -L${STAGING_LIBDIR}"
 do_stage () {
 	autotools_stage_all
 }
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}/*"
+RRECOMMENDS_${PN} = "gpe-icons"
diff --git a/packages/libgpewidget/libgpewidget_0.115.bb b/packages/libgpewidget/libgpewidget_0.115.bb
index 9ea3009404..2aa529f723 100644
--- a/packages/libgpewidget/libgpewidget_0.115.bb
+++ b/packages/libgpewidget/libgpewidget_0.115.bb
@@ -1,18 +1,15 @@
-LICENSE     = "LGPL"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+LICENSE = "LGPL"
 SECTION = "gpe/libs"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ cairo libxinerama libxrender gtk-doc"
-PR          = "r1"
+DEPENDS = "gtk+ cairo libxinerama libxrender gtk-doc"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
+
 inherit gpe pkgconfig autotools
 
 SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
 
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}/*"
-
 EXTRA_OECONF = "--enable-cairo"
 
 LDFLAGS += " -L${STAGING_LIBDIR}"
@@ -20,3 +17,7 @@ LDFLAGS += " -L${STAGING_LIBDIR}"
 do_stage () {
 	autotools_stage_all
 }
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}/*"
+RRECOMMENDS = "gpe-icons"
diff --git a/packages/libgpewidget/libgpewidget_svn.bb b/packages/libgpewidget/libgpewidget_svn.bb
index 8b6d0ea584..324173752d 100644
--- a/packages/libgpewidget/libgpewidget_svn.bb
+++ b/packages/libgpewidget/libgpewidget_svn.bb
@@ -3,18 +3,20 @@ SECTION = "gpe/libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PV = "0.114+svn${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
-S = "${WORKDIR}/${PN}"
-PV = "0.114+svn${SRCDATE}"
-
 inherit gpe autotools pkgconfig
 
 SRC_URI = "${GPE_SVN}"
+S = "${WORKDIR}/${PN}"
 
 EXTRA_OECONF = "--enable-cairo"
 
 do_stage () {
 	autotools_stage_all
 }
+
+RRECOMMENDS_${PN} = "gpe-icons"