Patchwork [meta-oe,3/5] abiword: fix packaging after PACKAGES reorder

login
register
mail settings
Submitter Martin Jansa
Date June 23, 2012, 9:15 p.m.
Message ID <547b8720bf9277bf8e7dd292e98d05759cbcf7d4.1340486086.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/30553/
State Accepted
Commit f900bd8be72ed5347abeba1b6636d476aa7061d8
Headers show

Comments

Martin Jansa - June 23, 2012, 9:15 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 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(-)

Patch

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*"