[oe-commits] Martin Jansa : abiword: fix packaging after PACKAGES reorder
git at git.openembedded.org
git at git.openembedded.org
Mon Jun 25 07:07:59 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: f900bd8be72ed5347abeba1b6636d476aa7061d8
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=f900bd8be72ed5347abeba1b6636d476aa7061d8
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Sat Jun 23 21:15:34 2012 +0000
abiword: fix packaging after PACKAGES reorder
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
meta-gnome/recipes-gnome/abiword/abiword-2.5.inc | 1 +
meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
index 67a5ef4..9b5adcc 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
@@ -55,6 +55,7 @@ do_configure() {
do_install_append() {
install -d ${D}${datadir}/pixmaps/
mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+ rmdir ${D}${datadir}/icons
}
PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
index 53a980e..ba0b979 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -2,7 +2,7 @@ require abiword-2.5.inc
DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio"
RCONFLICTS_${PN} = "abiword-embedded"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \
file://autogen-common.sh \
@@ -58,6 +58,8 @@ python populate_packages_prepend () {
bb.data.setVar('PACKAGES', ' '.join(packages), d)
}
-FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la"
+# don't steal /usr/lib/libabiword-2.8.so from ${PN}
+# in this case it's needed in ${PN}
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/abiword*.la ${libdir}/abiword-${SHRT_VER}/plugins/*.la ${libdir}/libabiword*.la"
FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug"
FILES_${PN}-doc += "${datadir}/abiword-*/readme*"
More information about the Openembedded-commits
mailing list