From 5da5ee1a5708f9a30c61636f29548acd3a4ae02c Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 30 Oct 2009 10:27:27 +0100
Subject: abiword: replace 2.8.0 with 2.8.1, some crashes fixed and libtool
 macros updated

---
 recipes/abiword/abiword_2.8.0.bb | 48 ----------------------------------------
 recipes/abiword/abiword_2.8.1.bb | 46 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 48 deletions(-)
 delete mode 100644 recipes/abiword/abiword_2.8.0.bb
 create mode 100644 recipes/abiword/abiword_2.8.1.bb

(limited to 'recipes/abiword')

diff --git a/recipes/abiword/abiword_2.8.0.bb b/recipes/abiword/abiword_2.8.0.bb
deleted file mode 100644
index 546e29cd64..0000000000
--- a/recipes/abiword/abiword_2.8.0.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-require abiword-2.5.inc
-
-PR = "r1"
-
-SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
-
-do_configure() {
-	autotools_do_configure
-}
-
-EXTRA_OECONF = " --disable-static  \
-                 --enable-plugins \
-                 --enable-collab-backend-xmpp \
-                 --enable-collab-backend-tcp \
-                 --enable-collab-backend-service \
-"
-
-RCONFLICTS = "abiword-embedded"
-
-FILES_${PN} 			+= "${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml"
-FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"
-FILES_abiword-systemprofiles    += "${datadir}/abiword-${SHRT_VER}/system.profile*"
-
-PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*"
-
-python populate_packages_prepend () {
-	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.8/plugins', d)
-	do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
-
-	metapkg = "abiword-meta"
-	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
-	bb.data.setVar('FILES_' + metapkg, "", d)
-	blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
-	metapkg_rdepends = []
-	packages = bb.data.getVar('PACKAGES', d, 1).split()
-	for pkg in packages[1:]:
-		if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
-			print "Modifying ", pkg
-			metapkg_rdepends.append(pkg)
-	bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
-	bb.data.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package', d)
-	packages.append(metapkg)
-	bb.data.setVar('PACKAGES', ' '.join(packages), d)
-}
-
-FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la"
-FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug"
-
diff --git a/recipes/abiword/abiword_2.8.1.bb b/recipes/abiword/abiword_2.8.1.bb
new file mode 100644
index 0000000000..24e20a4e55
--- /dev/null
+++ b/recipes/abiword/abiword_2.8.1.bb
@@ -0,0 +1,46 @@
+require abiword-2.5.inc
+
+SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+
+do_configure() {
+	autotools_do_configure
+}
+
+EXTRA_OECONF = " --disable-static  \
+                 --enable-plugins \
+                 --enable-collab-backend-xmpp \
+                 --enable-collab-backend-tcp \
+                 --enable-collab-backend-service \
+"
+
+RCONFLICTS = "abiword-embedded"
+
+FILES_${PN} 			+= "${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml"
+FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"
+FILES_abiword-systemprofiles    += "${datadir}/abiword-${SHRT_VER}/system.profile*"
+
+PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.8/plugins', d)
+	do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+
+	metapkg = "abiword-meta"
+	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
+	bb.data.setVar('FILES_' + metapkg, "", d)
+	blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
+	metapkg_rdepends = []
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	for pkg in packages[1:]:
+		if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
+			print "Modifying ", pkg
+			metapkg_rdepends.append(pkg)
+	bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
+	bb.data.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package', d)
+	packages.append(metapkg)
+	bb.data.setVar('PACKAGES', ' '.join(packages), d)
+}
+
+FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la"
+FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug"
+
-- 
cgit 1.2.3-korg