ttf, ttf-dejavu: fix-up after RDEPNDS_PN global change

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/ttf-fonts/ttf-dejavu_2.23.bb b/recipes/ttf-fonts/ttf-dejavu_2.23.bb
index 931b9e6..3b50049 100644 (file)
--- a/recipes/ttf-fonts/ttf-dejavu_2.23.bb
+++ b/recipes/ttf-fonts/ttf-dejavu_2.23.bb
@@ -3,8 +3,13 @@ require ttf.inc
 DESCRIPTION = "DejaVu font - TTF Edition"
 HOMEPAGE = "http://dejavu.sourceforge.net/wiki/"
 LICENSE = "Bitstream Vera"
-RDEPENDS_${PN} = "ttf-dejavu-common"
-RDEPENDS_ttf-dejavu-common = ""
+# all subpackages except ${PN}-dbg and ${PN}-common itself rdepends on ${PN}-common
+RDEPENDS_${PN}-sans = "${PN}-common"
+RDEPENDS_${PN}-sans-mono = "${PN}-common"
+RDEPENDS_${PN}-sans-condensed = "${PN}-common"
+RDEPENDS_${PN}-serif = "${PN}-common"
+RDEPENDS_${PN}-serif-condensed = "${PN}-common"
+RDEPENDS_${PN}-common = ""
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \
@@ -17,16 +22,21 @@ do_install_append () {
        install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
 }
 
-PACKAGES = "${PN}-dbg ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \
-           ttf-dejavu-serif ttf-dejavu-serif-condensed ttf-dejavu-common"
+PACKAGES = "${PN}-dbg \
+            ${PN}-sans \
+            ${PN}-sans-mono \
+            ${PN}-sans-condensed \
+            ${PN}-serif \
+            ${PN}-serif-condensed \
+            ${PN}-common"
 RRECOMMENDS_${PN}-dbg = ""
 
-FILES_ttf-dejavu-sans            = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf"
-FILES_ttf-dejavu-sans-mono       = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf"
-FILES_ttf-dejavu-sans-condensed  = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf"
-FILES_ttf-dejavu-serif           = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf"
-FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf"
-FILES_ttf-dejavu-common          = "${sysconfdir}"
+FILES_${PN}-sans            = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf"
+FILES_${PN}-sans-mono       = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf"
+FILES_${PN}-sans-condensed  = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf"
+FILES_${PN}-serif           = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf"
+FILES_${PN}-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf"
+FILES_${PN}-common          = "${sysconfdir}"
 
 SRC_URI[md5sum] = "ff871dff0b3e8a11cd5c54478f11073f"
 SRC_URI[sha256sum] = "243642a1c3f4b6fd00125f5772ac5c8e4d0bb6586f5abb05829ead4b83ad5233"

diff --git a/recipes/ttf-fonts/ttf.inc b/recipes/ttf-fonts/ttf.inc
index 101d11b..af3f278 100644 (file)
--- a/recipes/ttf-fonts/ttf.inc
+++ b/recipes/ttf-fonts/ttf.inc
@@ -1,7 +1,8 @@
 DESCRIPTION ?= "TrueType font package ${PN}"
 SECTION = "fonts"
 PRIORITY = "optional"
-RRECOMMENDS_${PN} += "font-update-common"
+# don't use RRECOMMENDS_${PN} here because sometimes each font is packaged to separate package and each one needs this dep to call update-fonts
+RRECOMMENDS += "font-update-common"
 
 # we don't need a compiler nor a c library for these fonts
 INHIBIT_DEFAULT_DEPS = "1"