abiword: merge abiword-2.5.inc to abiword_2.8.6.bb

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 68 insertions, 68 deletions

diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
deleted file mode 100644
index 9b5adcc74..000000000
--- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
-HOMEPAGE = "http://www.abiword.org"
-SECTION = "x11/office"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
-DEPENDS     = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
-RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
-           file://fix.double.install.patch \
-"
-SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
-SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
-
-#want 2.x from 2.x.y for the installation directory
-SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-
-FILES_${PN} += " \
-                ${datadir}/icons/* \
-                ${datadir}/abiword-${SHRT_VER}/glade \
-                ${datadir}/abiword-${SHRT_VER}/scripts \
-                ${datadir}/abiword-${SHRT_VER}/system.profile-en \
-                ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
-                ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
-                ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
-                ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
-                ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
-                ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
-                ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
-                ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
-                ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
-                ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = " --disable-pspell \
-                 --disable-spellcheck \
-                 --disable-printing \
-                 --disable-exports \
-                 --with-sys-wv"
-
-# AbiWord configure.ac does not play nicely with autoreconf
-# so use the autogen.sh script that comes with AbiWord
-#
-do_configure() {
-        cd ${S}
-        export NOCONFIGURE="no"; ./autogen.sh
-        oe_runconf
-}
-
-
-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 "
-
-FILES_abiword-clipart           += "${datadir}/abiword-${SHRT_VER}/clipart"
-FILES_abiword-icons             += "${datadir}/abiword-${SHRT_VER}/icons"
-FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
-FILES_abiword-systemprofiles    += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
-FILES_abiword-templates         += "${datadir}/abiword-${SHRT_VER}/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 ba0b97909..927c33af4 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -1,4 +1,71 @@
-require abiword-2.5.inc
+DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
+DEPENDS     = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
+RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
+               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://fix.double.install.patch \
+"
+SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
+SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
+
+#want 2.x from 2.x.y for the installation directory
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+FILES_${PN} += " \
+                ${datadir}/icons/* \
+                ${datadir}/abiword-${SHRT_VER}/glade \
+                ${datadir}/abiword-${SHRT_VER}/scripts \
+                ${datadir}/abiword-${SHRT_VER}/system.profile-en \
+                ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
+                ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
+                ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
+                ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
+                ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
+                ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
+                ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
+                ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
+                ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
+                ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
+
+inherit autotools pkgconfig
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF = " --disable-pspell \
+                 --disable-spellcheck \
+                 --disable-printing \
+                 --disable-exports \
+                 --with-sys-wv"
+
+# AbiWord configure.ac does not play nicely with autoreconf
+# so use the autogen.sh script that comes with AbiWord
+#
+do_configure() {
+        cd ${S}
+        export NOCONFIGURE="no"; ./autogen.sh
+        oe_runconf
+}
+
+
+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 "
+
+FILES_abiword-clipart           += "${datadir}/abiword-${SHRT_VER}/clipart"
+FILES_abiword-icons             += "${datadir}/abiword-${SHRT_VER}/icons"
+FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
+FILES_abiword-systemprofiles    += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
+FILES_abiword-templates         += "${datadir}/abiword-${SHRT_VER}/templates"
+
 DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio"
 RCONFLICTS_${PN} = "abiword-embedded"