[oe-commits] org.oe.oz354x disapproval of revision 'd6ac6bfa9302e2f0ed978521c1ffbf4971a4547e'

[koen commit]

disapproval of revision 'd6ac6bfa9302e2f0ed978521c1ffbf4971a4547e'

Author: koen at openembedded.org
Branch: org.openembedded.oz354x
Revision: dda4619bf87cec3ed024669c1c8d401abdd3202c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dda4619bf87cec3ed024669c1c8d401abdd3202c
Files:
1
packages/abiword/abiword-plugins_2.4.5.bb
packages/abiword/abiword_2.4.5.bb
Diffs:

#
# mt diff -rd6ac6bfa9302e2f0ed978521c1ffbf4971a4547e -rdda4619bf87cec3ed024669c1c8d401abdd3202c
#
# 
# 
# patch "packages/abiword/abiword-plugins_2.4.5.bb"
#  from [36cc916dee07755957b6144460fe59eb9554939e]
#    to [816600068f41d55a7d38eceb472b719a2d44293d]
# 
# patch "packages/abiword/abiword_2.4.5.bb"
#  from [d1696ced933ea66474159000ca8185bea26bf064]
#    to [649f2dd6b30eef8ceb6318b033fd21c5508c53f8]
# 
============================================================
--- packages/abiword/abiword-plugins_2.4.5.bb	36cc916dee07755957b6144460fe59eb9554939e
+++ packages/abiword/abiword-plugins_2.4.5.bb	816600068f41d55a7d38eceb472b719a2d44293d
@@ -1,11 +1,10 @@ DESCRIPTION ="AbiWord is free word proce
 DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-SECTION = "gnome/office"
 HOMEPAGE="http://www.abiword.org""
 MAINTAINER="Koen Kooi <koen at dominion.kabel.utwente.nl>"
 LICENSE="GPLv2"
 
 DEPENDS     = "abiword libwpd librsvg goffice poppler"
-PR="r1"
+PR="r0"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
            file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
============================================================
--- packages/abiword/abiword_2.4.5.bb	d1696ced933ea66474159000ca8185bea26bf064
+++ packages/abiword/abiword_2.4.5.bb	649f2dd6b30eef8ceb6318b033fd21c5508c53f8
@@ -1,4 +1,42 @@
-require abiword.inc
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen at handhelds.org>"
+LICENSE="GPLv2"
 
-RCONFLICTS = "abiword-embedded"
+DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
+RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
+               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+PR="r0"
 
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+S = "${WORKDIR}/abiword-${PV}/abi"
+
+FILES_${PN} += " ${datadir}/icons/* \
+${datadir}/AbiSuite-2.4/AbiWord/glade \
+${datadir}/AbiSuite-2.4/AbiWord/scripts \
+${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \
+${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \
+#${datadir}/AbiSuite-2.4/templates/A4.awt \
+#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \
+${datadir}/AbiSuite-2.4/templates/normal.awt \
+${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \
+${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \
+${datadir}/AbiSuite-2.4/templates/Business-Report.awt \
+${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \
+${datadir}/AbiSuite-2.4/templates/Resume.awt \
+${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \
+${datadir}/AbiSuite-2.4/templates/Memo.awt \
+${datadir}/AbiSuite-2.4/templates/Press-Release.awt "
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = "--disable-pspell --enable-enchant"
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps/
+        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+}
+
+