frozen-bubble: fix RDEPENDS. Closes #3491.

2 files changed, 19 insertions, 11 deletions

diff --git a/recipes/frozen-bubble/frozen-bubble_1.0.0.bb b/recipes/frozen-bubble/frozen-bubble_1.0.0.bb
index 503c4c7a7d..f7f4be9143 100644
--- a/recipes/frozen-bubble/frozen-bubble_1.0.0.bb
+++ b/recipes/frozen-bubble/frozen-bubble_1.0.0.bb
@@ -1,6 +1,19 @@
 LICENSE = "GPL"
 SECTION = "games"
 DEPENDS = "libsdl-mixer libsdl-image sdl-perl"
+RDEPENDS_${PN} = "${PN}-data perl sdl-perl \
+                  perl-module-strict perl-module-vars \
+                  perl-module-getopt-long perl-module-exporter-heavy \
+                  perl-module-data-dumper \
+                  perl-module-bytes liblocale-gettext-perl \
+                  perl-module-dynaloader perl-module-posix \
+                  perl-module-autoloader perl-module-math-trig \
+                  perl-module-io-file perl-module-io \
+                  perl-module-file-spec-unix perl-module-time-hires \
+                  perl-module-io-socket perl-module-io-select \
+                  perl-module-file-glob \
+                 "
+PR = "r1"
 
 SRC_URI = "http://zarb.org/~gc/fb//frozen-bubble-${PV}.tar.bz2 \
 	file://Makefile_top.patch;patch=1 \
diff --git a/recipes/frozen-bubble/frozen-bubble_2.2.0.bb b/recipes/frozen-bubble/frozen-bubble_2.2.0.bb
index 27afc64f65..685dd2898d 100644
--- a/recipes/frozen-bubble/frozen-bubble_2.2.0.bb
+++ b/recipes/frozen-bubble/frozen-bubble_2.2.0.bb
@@ -5,24 +5,20 @@ DEPENDS = "sdlpango libsdl-mixer perl"
 RDEPENDS_${PN} = "${PN}-data perl sdl-perl \
 		  perl-module-strict perl-module-vars \
 		  perl-module-getopt-long perl-module-exporter-heavy \
-	          perl-module-data-dumper \
+		  perl-module-data-dumper \
 		  perl-module-bytes liblocale-gettext-perl \
 		  perl-module-dynaloader perl-module-posix \
-		  perl-module-math-trig \
+		  perl-module-autoloader perl-module-math-trig \
 		  perl-module-io-file perl-module-io \
-                  perl-module-file-spec-unix perl-module-time-hires \
-                  perl-module-io-socket perl-module-io-select \
-                  perl-module-file-glob \
+		  perl-module-file-spec-unix perl-module-time-hires \
+		  perl-module-io-socket perl-module-io-select \
+		  perl-module-file-glob \
 		 "
 
-PR="r0"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
 
 inherit cpan-base
 
-S=${WORKDIR}/frozen-bubble-2.2.0/
-
 PERL_VERSION = ${@get_perl_version(d)}
 
 SRC_URI = "http://www.frozen-bubble.org/data/frozen-bubble-${PV}.tar.bz2 \
@@ -37,7 +33,6 @@ SRC_URI = "http://www.frozen-bubble.org/data/frozen-bubble-${PV}.tar.bz2 \
 # The Makefile needs to be patched to look in STAGING_LIBDIR/perl/... - It's looking in i686-linux/lib at the moment, regardless of arch
 BROKEN = "1"
 
-
 do_compile() {
         oe_runmake OPTIMIZE="${CFLAGS}" PREFIX="${prefix}" INSTALLSITELIB="${D}/${libdir}/perl/${PERL_VERSION}/" LOCALEDIR="${datadir}/locale"
 }